Merge pull request #75 from gedorinku/achievement_image_url

実績の画像の更新

Author: gedorinku

app/di/store_component.go

@@ -18,6 +18,7 @@ import (
 	feedstore "github.com/ProgrammingLab/prolab-accounts/infra/store/feed"
 	githubstore "github.com/ProgrammingLab/prolab-accounts/infra/store/github"
 	heartbeatstore "github.com/ProgrammingLab/prolab-accounts/infra/store/heartbeat"
+	imagestore "github.com/ProgrammingLab/prolab-accounts/infra/store/image"
 	invitationstore "github.com/ProgrammingLab/prolab-accounts/infra/store/invitation"
 	resetstore "github.com/ProgrammingLab/prolab-accounts/infra/store/password_reset"
 	profilestore "github.com/ProgrammingLab/prolab-accounts/infra/store/profile"
@@ -44,6 +45,7 @@ type StoreComponent interface {
 	EmailConfirmationStore(ctx context.Context) store.EmailConfirmationStore
 	PasswordResetStore(ctx context.Context) store.PasswordResetStore
 	AchievementStore(ctx context.Context) store.AchievementStore
+	ImageStore(ctx context.Context) store.ImageStore
 }
 
 // NewStoreComponent returns new store component
@@ -146,7 +148,7 @@ type storeComponentImpl struct {
 }
 
 func (s *storeComponentImpl) UserStore(ctx context.Context) store.UserStore {
-	return userstore.NewUserStore(ctx, s.db, s.minioCli, s.cfg.MinioBucketName)
+	return userstore.NewUserStore(ctx, s.db)
 }
 
 func (s *storeComponentImpl) SessionStore(ctx context.Context) store.SessionStore {
@@ -200,3 +202,7 @@ func (s *storeComponentImpl) PasswordResetStore(ctx context.Context) store.Passw
 func (s *storeComponentImpl) AchievementStore(ctx context.Context) store.AchievementStore {
 	return achievementstore.NewAchievementStore(ctx, s.db)
 }
+
+func (s *storeComponentImpl) ImageStore(ctx context.Context) store.ImageStore {
+	return imagestore.NewImageStore(ctx, s.minioCli, s.cfg.MinioBucketName)
+}

app/server/achievements_server.go

@@ -10,6 +10,7 @@ import (
 	"github.com/izumin5210/grapi/pkg/grapiserver"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/status"
 
 	api_pb "github.com/ProgrammingLab/prolab-accounts/api"
@@ -43,12 +44,16 @@ type achievementServiceServerImpl struct {
 }
 
 const (
+	// MaxImageSize represents max of image size
+	MaxImageSize        = 1024 * 1024 * 3
 	pageTokenTimeLayout = time.RFC3339
 )
 
 var (
 	// ErrInvalidPageToken is returned when page token is invalid
 	ErrInvalidPageToken = status.Error(codes.InvalidArgument, "invalid page token")
+	// ErrImageSizeTooLarge will be returned when the image is too large
+	ErrImageSizeTooLarge = status.Error(codes.InvalidArgument, "image must be smaller than 3MiB")
 )
 
 func (s *achievementServiceServerImpl) ListAchievements(ctx context.Context, req *api_pb.ListAchievementsRequest) (*api_pb.ListAchievementsResponse, error) {
@@ -148,9 +153,45 @@ func (s *achievementServiceServerImpl) UpdateAchievement(ctx context.Context, re
 	return achievementToResponse(rec, true, s.cfg), nil
 }
 
-func (s *achievementServiceServerImpl) UpdateAchievementImage(context.Context, *api_pb.UpdateAchievementImageRequest) (*api_pb.Achievement, error) {
-	// TODO: Not yet implemented.
-	return nil, status.Error(codes.Unimplemented, "TODO: You should implement it!")
+func (s *achievementServiceServerImpl) UpdateAchievementImage(ctx context.Context, req *api_pb.UpdateAchievementImageRequest) (*api_pb.Achievement, error) {
+	_, ok := interceptor.GetCurrentUserID(ctx)
+	if !ok {
+		return nil, util.ErrUnauthenticated
+	}
+
+	image := req.GetImage()
+	if MaxImageSize < len(image) {
+		return nil, ErrImageSizeTooLarge
+	}
+
+	is := s.ImageStore(ctx)
+	name, err := is.CreateImage(image)
+	if err != nil {
+		return nil, err
+	}
+
+	as := s.AchievementStore(ctx)
+	ach, old, err := as.UpdateAchievementImage(int64(req.GetAchievementId()), name)
+	if err != nil {
+		if errors.Cause(err) == sql.ErrNoRows {
+			return nil, util.ErrNotFound
+		}
+		return nil, err
+	}
+
+	go func() {
+		if old == "" {
+			return
+		}
+
+		is := s.ImageStore(context.Background())
+		err := is.DeleteImage(old)
+		if err != nil {
+			grpclog.Errorf("failed to delete old user icon: %+v", err)
+		}
+	}()
+
+	return achievementToResponse(ach, true, s.cfg), nil
 }
 
 func (s *achievementServiceServerImpl) DeleteAchievement(ctx context.Context, req *api_pb.DeleteAchievementRequest) (*empty.Empty, error) {
@@ -190,7 +231,7 @@ func achievementToResponse(ach *record.Achievement, includePrivate bool, cfg *co
 		Award:         ach.Award,
 		Url:           ach.URL,
 		Description:   ach.Description,
-		ImageUrl:      ach.ImageFilename.String, // TODO
+		ImageUrl:      cfg.MinioPublicURL + "/" + cfg.MinioBucketName + "/" + ach.ImageFilename.String,
 		HappenedAt:    timeToResponse(ach.HappenedAt),
 	}
 

app/server/users_server.go

@@ -12,6 +12,7 @@ import (
 	"github.com/volatiletech/null"
 	"golang.org/x/crypto/bcrypt"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/status"
 
 	api_pb "github.com/ProgrammingLab/prolab-accounts/api"
@@ -288,15 +289,33 @@ func (s *userServiceServerImpl) UpdateUserIcon(ctx context.Context, req *api_pb.
 		return nil, ErrIconSizeTooLarge
 	}
 
+	is := s.ImageStore(ctx)
+	name, err := is.CreateImage(icon)
+	if err != nil {
+		return nil, err
+	}
+
 	us := s.UserStore(ctx)
-	u, err := us.UpdateIcon(id, icon)
+	u, old, err := us.UpdateIcon(id, name)
 	if err != nil {
 		if err := errors.Cause(err); err == image.ErrFormat {
 			return nil, ErrInvalidImageFormat
 		}
 		return nil, err
 	}
 
+	go func() {
+		if old == "" {
+			return
+		}
+
+		is := s.ImageStore(context.Background())
+		err := is.DeleteImage(old)
+		if err != nil {
+			grpclog.Errorf("failed to delete old user icon: %+v", err)
+		}
+	}()
+
 	return userToResponse(u, true, s.cfg), nil
 }
 

infra/store/achievement/achievement_store.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+	"github.com/volatiletech/null"
 	"github.com/volatiletech/sqlboiler/boil"
 	"github.com/volatiletech/sqlboiler/queries/qm"
 
@@ -121,6 +122,23 @@ func (s *achievementStoreImpl) UpdateAchievement(ach *record.Achievement, member
 	return ach, err
 }
 
+func (s *achievementStoreImpl) UpdateAchievementImage(id int64, filename string) (ach *record.Achievement, old string, err error) {
+	err = s.db.Watch(s.ctx, func(ctx context.Context, tx *sql.Tx) error {
+		ach, err = record.Achievements(qm.Where("id = ?", id), qm.Load("AchievementUsers.User")).One(ctx, tx)
+		if err != nil {
+			return errors.WithStack(err)
+		}
+
+		old = ach.ImageFilename.String
+
+		ach.ImageFilename = null.StringFrom(filename)
+		_, err = ach.Update(ctx, tx, boil.Whitelist("image_filename", "updated_at"))
+		return errors.WithStack(err)
+	})
+
+	return ach, old, err
+}
+
 func (s *achievementStoreImpl) DeleteAchievement(id int64) error {
 	err := s.db.Watch(s.ctx, func(ctx context.Context, tx *sql.Tx) error {
 		_, err := record.AchievementUsers(record.AchievementUserWhere.AchievementID.EQ(id)).DeleteAll(s.ctx, tx)

infra/store/achievement_store.go

@@ -13,5 +13,6 @@ type AchievementStore interface {
 	GetAchievement(id int64) (*record.Achievement, error)
 	ListAchievements(before time.Time, limit int) (aches []*record.Achievement, next time.Time, err error)
 	UpdateAchievement(ach *record.Achievement, memberIDs []model.UserID) (*record.Achievement, error)
+	UpdateAchievementImage(id int64, filename string) (ach *record.Achievement, old string, err error)
 	DeleteAchievement(id int64) error
 }

infra/store/image/image_store.go

@@ -0,0 +1,71 @@
+package imagestore
+
+import (
+	"bytes"
+	"context"
+	"crypto/rand"
+	"encoding/base64"
+	"image"
+	_ "image/gif" // for image
+	_ "image/jpeg"
+	_ "image/png"
+
+	"github.com/minio/minio-go"
+	"github.com/pkg/errors"
+
+	"github.com/ProgrammingLab/prolab-accounts/infra/store"
+)
+
+type imageStoreImpl struct {
+	ctx        context.Context
+	cli        *minio.Client
+	bucketName string
+}
+
+// NewImageStore returns new image store
+func NewImageStore(ctx context.Context, cli *minio.Client, bucket string) store.ImageStore {
+	return &imageStoreImpl{
+		ctx:        ctx,
+		cli:        cli,
+		bucketName: bucket,
+	}
+}
+
+func (s *imageStoreImpl) CreateImage(img []byte) (filename string, err error) {
+	r := bytes.NewReader(img)
+	_, ext, err := image.DecodeConfig(r)
+	if err != nil {
+		return "", errors.WithStack(err)
+	}
+	name, err := generateFilename(ext)
+	if err != nil {
+		return "", errors.WithStack(err)
+	}
+
+	opt := minio.PutObjectOptions{
+		ContentType: "image/" + ext,
+	}
+	_, err = s.cli.PutObjectWithContext(s.ctx, s.bucketName, name, r, r.Size(), opt)
+	if err != nil {
+		return "", errors.WithStack(err)
+	}
+
+	return name, nil
+}
+
+func (s *imageStoreImpl) DeleteImage(filename string) error {
+	err := s.cli.RemoveObject(s.bucketName, filename)
+	return errors.WithStack(err)
+}
+
+func generateFilename(ext string) (string, error) {
+	b := make([]byte, 32)
+	_, err := rand.Read(b)
+	if err != nil {
+		return "", errors.WithStack(err)
+	}
+
+	res := base64.RawURLEncoding.EncodeToString(b)
+
+	return string(res) + "." + ext, nil
+}

infra/store/image_store.go

@@ -0,0 +1,7 @@
+package store
+
+// ImageStore provides images
+type ImageStore interface {
+	CreateImage(image []byte) (filename string, err error)
+	DeleteImage(filename string) error
+}

infra/store/user/user_store.go

@@ -1,17 +1,11 @@
 package userstore
 
 import (
-	"bytes"
 	"context"
 	"crypto/rand"
 	"database/sql"
 	"encoding/base64"
-	"image"
-	_ "image/gif" // for image
-	_ "image/jpeg"
-	_ "image/png"
 
-	minio "github.com/minio/minio-go"
 	"github.com/pkg/errors"
 	"github.com/volatiletech/null"
 	"github.com/volatiletech/sqlboiler/boil"
@@ -24,19 +18,15 @@ import (
 )
 
 type userStoreImpl struct {
-	ctx        context.Context
-	db         *sqlutil.DB
-	cli        *minio.Client
-	bucketName string
+	ctx context.Context
+	db  *sqlutil.DB
 }
 
 // NewUserStore returns new user store
-func NewUserStore(ctx context.Context, db *sqlutil.DB, cli *minio.Client, bucket string) store.UserStore {
+func NewUserStore(ctx context.Context, db *sqlutil.DB) store.UserStore {
 	return &userStoreImpl{
-		ctx:        ctx,
-		db:         db,
-		cli:        cli,
-		bucketName: bucket,
+		ctx: ctx,
+		db:  db,
 	}
 }
 
@@ -167,52 +157,25 @@ func (s *userStoreImpl) UpdateFullName(userID model.UserID, fullName string) (*r
 	return u, nil
 }
 
-func (s *userStoreImpl) UpdateIcon(userID model.UserID, icon []byte) (*record.User, error) {
-	r := bytes.NewReader(icon)
-	_, ext, err := image.DecodeConfig(r)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-	name, err := generateFilename(ext)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
+func (s *userStoreImpl) UpdateIcon(userID model.UserID, filename string) (*record.User, string, error) {
 	mods := []qm.QueryMod{
 		qm.Load("Profile.Role"),
 		qm.Load("Profile.Department"),
 		qm.Where("id = ?", userID),
 	}
 	u, err := record.Users(mods...).One(s.ctx, s.db)
 	if err != nil {
-		return nil, errors.WithStack(err)
+		return nil, "", errors.WithStack(err)
 	}
 
-	opt := minio.PutObjectOptions{
-		ContentType: "image/" + ext,
-	}
-	_, err = s.cli.PutObjectWithContext(s.ctx, s.bucketName, name, r, r.Size(), opt)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	old := u.AvatarFilename
-	u.AvatarFilename = null.StringFrom(name)
+	old := u.AvatarFilename.String
+	u.AvatarFilename = null.StringFrom(filename)
 	_, err = u.Update(s.ctx, s.db, boil.Whitelist(record.UserColumns.AvatarFilename, record.UserColumns.UpdatedAt))
 	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	if !old.Valid {
-		return u, nil
-	}
-
-	err = s.cli.RemoveObject(s.bucketName, old.String)
-	if err != nil {
-		return nil, errors.WithStack(err)
+		return nil, "", errors.WithStack(err)
 	}
 
-	return u, nil
+	return u, old, nil
 }
 
 func generateFilename(ext string) (string, error) {

infra/store/user_store.go

@@ -15,5 +15,5 @@ type UserStore interface {
 	ListPublicUsers(minUserID model.UserID, limit int) ([]*record.User, model.UserID, error)
 	ListPrivateUsers(minUserID model.UserID, limit int) ([]*record.User, model.UserID, error)
 	UpdateFullName(userID model.UserID, fullName string) (*record.User, error)
-	UpdateIcon(userID model.UserID, icon []byte) (*record.User, error)
+	UpdateIcon(userID model.UserID, filename string) (u *record.User, old string, err error)
 }