Skip to content

feat: friend active status list returns all results #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dk-a-dev merged 1 commit into from
Aug 3, 2025
Merged

feat: friend active status list returns all results #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions vitty-backend-api/api/serializers/friends.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
6 changes: 3 additions & 3 deletions vitty-backend-api/api/v2/friendHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions vitty-backend-api/internal/models/userFriends.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Loading