Merge pull request #82 from Dzalevski/refactor/storage-interface-implement

Author: moul

.gitignore

@@ -31,4 +31,7 @@ gin-bin
 *.out
 
 # better safe than sorry
-config.txt
+config.txt
+
+# IDE Settings
+.idea

AUTHORS

@@ -281,3 +281,13 @@ message Session {
   int64 user_id = 1 [(go.field) = {name: "UserID"}];
   string discord_access_token = 2;
 }
+
+message UploadsByWeek {
+  int64 weekday = 1;
+  int64 quantity = 2;
+}
+
+message PostByKind {
+  int64 quantity = 1;
+  Post.Kind kind = 2;
+}

api/sgtm.proto

@@ -30,17 +30,11 @@ func (svc *Service) Me(ctx context.Context, req *sgtmpb.Me_Request) (*sgtmpb.Me_
 		return nil, err
 	}
 
-	var user sgtmpb.User
-	err = svc.rodb().
-		Where("id = ?", claims.Session.UserID).
-		First(&user).
-		Error
+	user, err := svc.storage.GetUserByID(claims.Session.UserID)
 	if err != nil {
 		return nil, err
 	}
-	ret := sgtmpb.Me_Response{User: &user}
-
-	return &ret, nil
+	return &sgtmpb.Me_Response{User: user}, nil
 }
 
 func (svc *Service) Ping(context.Context, *sgtmpb.Ping_Request) (*sgtmpb.Ping_Response, error) {
@@ -57,39 +51,18 @@ func (svc *Service) Status(context.Context, *sgtmpb.Status_Request) (*sgtmpb.Sta
 }
 
 func (svc *Service) UserList(context.Context, *sgtmpb.UserList_Request) (*sgtmpb.UserList_Response, error) {
-	ret := &sgtmpb.UserList_Response{}
-	err := svc.rodb().
-		Order("created_at desc").
-		Find(&ret.Users).
-		Error
+	users, err := svc.storage.GetLastUsersList(100)
 	if err != nil {
 		return nil, err
 	}
-
-	for _, user := range ret.Users {
-		user.Filter()
-	}
-	return ret, nil
+	return &sgtmpb.UserList_Response{Users: users}, nil
 }
 
 func (svc *Service) PostList(context.Context, *sgtmpb.PostList_Request) (*sgtmpb.PostList_Response, error) {
-	ret := &sgtmpb.PostList_Response{}
-	err := svc.rodb().
-		Order("sort_date desc").
-		Where(sgtmpb.Post{
-			Visibility: sgtmpb.Visibility_Public,
-		}).
-		Where("kind in (?)", sgtmpb.Post_TrackKind).
-		Limit(100).
-		Find(&ret.Posts).
-		Error
+	posts, err := svc.storage.GetPostList(100)
 	if err != nil {
 		return nil, err
 	}
 
-	for _, post := range ret.Posts {
-		post.Filter()
-	}
-
-	return ret, nil
+	return &sgtmpb.PostList_Response{Posts: posts}, nil
 }

gen.sum

@@ -4,6 +4,7 @@ import (
 	"github.com/bwmarrin/snowflake"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
+
 	"moul.io/sgtm/pkg/sgtmpb"
 )
 

go.mod

@@ -302,10 +302,7 @@ func (svc *Service) generateSitemap() *stm.Sitemap {
 	})
 	// users
 	{
-		var users []*sgtmpb.User
-		err := svc.rodb().
-			Find(&users).
-			Error
+		users, err := svc.storage.GetLastUsersList(1000)
 		if err != nil {
 			svc.logger.Error("query users for sitemap", zap.Error(err))
 		} else {
@@ -319,14 +316,7 @@ func (svc *Service) generateSitemap() *stm.Sitemap {
 	}
 	// posts
 	{
-		var posts []*sgtmpb.Post
-		err := svc.rodb().
-			Where(sgtmpb.Post{
-				Visibility: sgtmpb.Visibility_Public,
-				Kind:       sgtmpb.Post_TrackKind,
-			}).
-			Find(&posts).
-			Error
+		posts, err := svc.storage.GetPostList(100)
 		if err != nil {
 			svc.logger.Error("query posts for sitemap", zap.Error(err))
 		} else {

go.sum

@@ -12,11 +12,10 @@ import (
 	"time"
 
 	"github.com/bwmarrin/discordgo"
-	jwt "github.com/dgrijalva/jwt-go"
-	"github.com/gosimple/slug"
+	"github.com/dgrijalva/jwt-go"
 	"go.uber.org/zap"
 	"golang.org/x/oauth2"
-	"gorm.io/gorm"
+
 	"moul.io/sgtm/pkg/sgtmpb"
 )
 
@@ -123,66 +122,20 @@ func (svc *Service) httpAuthCallback(w http.ResponseWriter, r *http.Request) {
 		svc.logger.Debug("get user settings", zap.Any("user", discordUser))
 	}
 
-	// create/update user in DB
-	var dbUser sgtmpb.User
-	{
-		dbUser.Email = discordUser.Email
-		err := svc.rodb().Where(&dbUser).First(&dbUser).Error
-		switch {
-		case errors.Is(err, gorm.ErrRecordNotFound):
-			// user not found, creating it
-			dbUser = sgtmpb.User{
-				Email:           discordUser.Email,
-				Avatar:          fmt.Sprintf("https://cdn.discordapp.com/avatars/%s/%s.png", discordUser.ID, discordUser.Avatar),
-				Slug:            slug.Make(discordUser.Username),
-				Locale:          discordUser.Locale,
-				DiscordID:       discordUser.ID,
-				DiscordUsername: fmt.Sprintf("%s#%s", discordUser.Username, discordUser.Discriminator),
-				// Firstname
-				// Lastname
-			}
-			// FIXME: check if slug already exists, if yes, append something to the slug
-			err = svc.rwdb().Transaction(func(tx *gorm.DB) error {
-				if err := tx.Create(&dbUser).Error; err != nil {
-					return err
-				}
-
-				registerEvent := sgtmpb.Post{AuthorID: dbUser.ID, Kind: sgtmpb.Post_RegisterKind}
-				if err := tx.Create(&registerEvent).Error; err != nil {
-					return err
-				}
-				svc.logger.Debug("new register", zap.Any("event", &registerEvent))
-
-				linkDiscordEvent := sgtmpb.Post{AuthorID: dbUser.ID, Kind: sgtmpb.Post_LinkDiscordAccountKind}
-				if err := tx.Create(&linkDiscordEvent).Error; err != nil {
-					return err
-				}
-				svc.logger.Debug("new link discord event", zap.Any("event", &registerEvent))
-
-				return nil
-			})
-			if err != nil {
-				svc.errRenderHTML(w, r, err, http.StatusUnprocessableEntity)
-				return
-			}
-
-		case err == nil:
-			// user exists
-			// FIXME: update user in DB if needed
-
-			loginEvent := sgtmpb.Post{AuthorID: dbUser.ID, Kind: sgtmpb.Post_LoginKind}
-			if err := svc.rwdb().Create(&loginEvent).Error; err != nil {
-				svc.errRenderHTML(w, r, err, http.StatusUnprocessableEntity)
-				return
-			}
-			svc.logger.Debug("new login", zap.Any("event", &loginEvent))
-
-		default:
-			// unexpected error
-			svc.errRenderHTML(w, r, err, http.StatusUnprocessableEntity)
-			return
-		}
+	dbUser := &sgtmpb.User{
+		Email:           discordUser.Email,
+		DiscordID:       discordUser.ID,
+		DiscordUsername: discordUser.Username,
+		Slug:            discordUser.Username,
+		Locale:          discordUser.Locale,
+		Avatar:          discordUser.Avatar,
+	}
+	dbUser, err := svc.storage.CreateUser(dbUser)
+	if err != nil {
+		svc.errRenderHTML(w, r, err, http.StatusUnprocessableEntity)
+		return
 	}
+	svc.logger.Debug("user created/updated", zap.Any("user", &dbUser))
 
 	// prepare JWT token
 	var tokenString string