diff --git a/vitty-backend-api/api/serializers/friends.go b/vitty-backend-api/api/serializers/friends.go index 2868a27..40ed648 100644 --- a/vitty-backend-api/api/serializers/friends.go +++ b/vitty-backend-api/api/serializers/friends.go @@ -12,11 +12,14 @@ func FriendRequestsSerializer(friend_requests []models.FriendRequest, request_us return friend_requests_list } -func ActiveFriendsSerializer(userFriends *[]models.UserFriends) []string { - var activeFriends []string +func ActiveFriendsSerializer(userFriends *[]models.UserFriends) []map[string]interface{} { + var activeFriends []map[string]interface{} for _, userFriend := range *userFriends { - activeFriends = append(activeFriends, userFriend.FriendUsername) + activeFriends = append(activeFriends, map[string]interface{}{ + "friend_username": userFriend.FriendUsername, + "hide": userFriend.Hide, + }) } return activeFriends } diff --git a/vitty-backend-api/api/v2/friendHandler.go b/vitty-backend-api/api/v2/friendHandler.go index 1b95018..6cf9385 100644 --- a/vitty-backend-api/api/v2/friendHandler.go +++ b/vitty-backend-api/api/v2/friendHandler.go @@ -22,7 +22,7 @@ func FriendHandler(api fiber.Router) { friendGroup := api.Group("/friends") friendGroup.Use(middleware.JWTAuthMiddleware) - friendGroup.Get("/active", getActiveFriends) + friendGroup.Get("/active", getFriendsGhostStatus) friendGroup.Get("/:username", getFriends) friendGroup.Delete("/:username", removeFriend) friendGroup.Post("/ghost/:username", becomeGhost) @@ -181,11 +181,11 @@ func getFriends(c *fiber.Ctx) error { }) } -func getActiveFriends(c *fiber.Ctx) error { +func getFriendsGhostStatus(c *fiber.Ctx) error { var userFriend models.UserFriends request_user := c.Locals("user").(models.User) - userFriends, err := userFriend.GetActiveFriends(request_user.Username) + userFriends, err := userFriend.GetFriendsGhostStatus(request_user.Username) if err != nil { log.Default().Println(err) return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{ diff --git a/vitty-backend-api/internal/models/userFriends.go b/vitty-backend-api/internal/models/userFriends.go index 6307322..09c6ab8 100644 --- a/vitty-backend-api/internal/models/userFriends.go +++ b/vitty-backend-api/internal/models/userFriends.go @@ -13,10 +13,10 @@ type UserFriends struct { UpdatedAt *time.Time `gorm:"default:CURRENT_TIMESTAMP"` } -func (uf *UserFriends) GetActiveFriends(username string) ([]UserFriends, error) { +func (uf *UserFriends) GetFriendsGhostStatus(username string) ([]UserFriends, error) { var userFriends []UserFriends - err := database.DB.Where("user_username = ? AND hide = false", username).Find(&userFriends).Error + err := database.DB.Where("user_username = ?", username).Find(&userFriends).Error return userFriends, err }