update follower/following apis

Author: miladrahimi

internal/http/server/handlers/v1/users.go

@@ -7,7 +7,6 @@ import (
 	"github.com/neatplex/nightell-core/internal/services/container"
 	"github.com/neatplex/nightell-core/internal/utils"
 	"net/http"
-	"strconv"
 )
 
 func UsersShow(ctr *container.Container) echo.HandlerFunc {
@@ -30,10 +29,26 @@ func UsersShow(ctr *container.Container) echo.HandlerFunc {
 			return errors.WithStack(err)
 		}
 
+		authUser := ctx.Get("user").(*models.User)
+
+		relation, err := ctr.FollowshipService.FindByIds(user.ID, authUser.ID)
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		followsMe := relation != nil
+
+		relation, err = ctr.FollowshipService.FindByIds(authUser.ID, user.ID)
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		followedByMe := relation != nil
+
 		return ctx.JSON(http.StatusOK, map[string]interface{}{
 			"user":             user,
 			"followers_count":  followersCount,
 			"followings_count": followingsCount,
+			"follows_me":       followsMe,
+			"followed_by_me":   followedByMe,
 		})
 	}
 }
@@ -98,50 +113,44 @@ func UsersFollowings(ctr *container.Container) echo.HandlerFunc {
 	}
 }
 
-func UsersFollowingsStore(ctr *container.Container) echo.HandlerFunc {
+func UsersFollowersStore(ctr *container.Container) echo.HandlerFunc {
 	return func(ctx echo.Context) error {
-		user := ctx.Get("user").(*models.User)
+		userId := utils.StringToID(ctx.Param("userId"), 0)
+		authUser := ctx.Get("user").(*models.User)
 
-		if strconv.FormatUint(user.ID, 10) == ctx.Param("followeeId") {
+		if authUser.ID == userId {
 			return ctx.JSON(http.StatusForbidden, map[string]interface{}{
 				"message": "You cannot follow yourself!",
 			})
 		}
 
-		followee, err := ctr.UserService.FindBy("id", utils.StringToID(ctx.Param("followeeId"), 0))
+		followee, err := ctr.UserService.FindBy("id", userId)
 		if err != nil {
 			return errors.WithStack(err)
 		}
 		if followee == nil {
 			return ctx.NoContent(http.StatusNotFound)
 		}
 
-		if _, err = ctr.FollowshipService.Create(followee.ID, user.ID); err != nil {
+		if _, err = ctr.FollowshipService.Create(followee.ID, authUser.ID); err != nil {
 			return errors.WithStack(err)
 		}
 
 		return ctx.NoContent(http.StatusCreated)
 	}
 }
 
-func UsersFollowingsDelete(ctr *container.Container) echo.HandlerFunc {
+func UsersFollowersDelete(ctr *container.Container) echo.HandlerFunc {
 	return func(ctx echo.Context) error {
-		user := ctx.Get("user").(*models.User)
-
-		if strconv.FormatUint(user.ID, 10) == ctx.Param("followeeId") {
-			return ctx.JSON(http.StatusForbidden, map[string]interface{}{
-				"message": "You cannot follow yourself!",
-			})
-		}
+		userId := utils.StringToID(ctx.Param("userId"), 0)
+		authUser := ctx.Get("user").(*models.User)
 
-		followship, err := ctr.FollowshipService.FindByIds(
-			user.ID, utils.StringToID(ctx.Param("followeeId"), 0),
-		)
+		followship, err := ctr.FollowshipService.FindByIds(authUser.ID, userId)
 		if err != nil {
 			return errors.WithStack(err)
 		}
 		if followship == nil {
-			return ctx.NoContent(http.StatusNotFound)
+			return ctx.NoContent(http.StatusNoContent)
 		}
 
 		err = ctr.FollowshipService.Delete(followship.ID)

internal/http/server/routes.go

@@ -38,10 +38,10 @@ func (s *Server) registerRoutes() {
 			private.DELETE("profile", v1.ProfileDelete(s.container))
 			// users
 			private.GET("users/:userId", v1.UsersShow(s.container))
-			private.GET("users/:userId/followers", v1.UsersFollowers(s.container))
 			private.GET("users/:userId/followings", v1.UsersFollowings(s.container))
-			private.POST("users/:userId/followings/:followeeId", v1.UsersFollowingsStore(s.container))
-			private.DELETE("users/:userId/followings/:followeeId", v1.UsersFollowingsDelete(s.container))
+			private.GET("users/:userId/followers", v1.UsersFollowers(s.container))
+			private.POST("users/:userId/followers", v1.UsersFollowersStore(s.container))
+			private.DELETE("users/:userId/followers", v1.UsersFollowersDelete(s.container))
 			// posts
 			private.GET("users/:userId/posts", v1.PostsIndex(s.container))
 			private.POST("posts", v1.PostsStore(s.container))

internal/models/followship.go

@@ -4,9 +4,9 @@ import "time"
 
 type Followship struct {
 	ID         uint64    `gorm:"primaryKey" json:"id"`
-	FollowerID uint64    `json:"follower_id"`
+	FollowerID uint64    `gorm:"index:idx_follower_id_followee_id,priority:1" json:"follower_id"`
 	Follower   *User     `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE;" json:"follower"`
-	FolloweeID uint64    `json:"followee_id"`
+	FolloweeID uint64    `gorm:"index:idx_follower_id_followee_id,priority:2" json:"followee_id"`
 	Followee   *User     `gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE;" json:"followee"`
 	CreatedAt  time.Time `json:"created_at"`
 }

internal/services/followship/service.go

@@ -4,6 +4,7 @@ import (
 	"github.com/cockroachdb/errors"
 	"github.com/neatplex/nightell-core/internal/database"
 	"github.com/neatplex/nightell-core/internal/models"
+	"gorm.io/gorm"
 )
 
 type Service struct {
@@ -15,7 +16,10 @@ func (s *Service) FindByIds(followerID, followeeID uint64) (*models.Followship,
 	r := s.database.Handler().
 		Where("follower_id = ?", followerID).
 		Where("followee_id = ?", followeeID).
-		Find(&followship)
+		First(&followship)
+	if r.Error != nil && errors.Is(r.Error, gorm.ErrRecordNotFound) {
+		return nil, nil
+	}
 	return &followship, errors.Wrapf(r.Error, "followerId: %v, followeeId: %v", followerID, followeeID)
 }