Merge pull request #97 from RealTeamRocket/96-homepage

some basic stuff

Author: Pazl27

mobile_app/pubspec.lock

@@ -21,10 +21,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.12.0"
+    version: "2.13.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -133,10 +133,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.3"
   ffi:
     dependency: transitive
     description:
@@ -540,10 +540,10 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
+      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.8"
+    version: "10.0.9"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
@@ -1041,10 +1041,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
+      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
       url: "https://pub.dev"
     source: hosted
-    version: "14.3.1"
+    version: "15.0.0"
   web:
     dependency: transitive
     description:

rocket-backend/integration-tests/mocks/database_mock.go

@@ -10,45 +10,48 @@ import (
 )
 
 type MockDB struct {
-	ExecuteRawSQLFunc            func(query string) (sql.Result, error)
-	QueryRowFunc                 func(query string, args ...interface{}) *sql.Row
-	HealthFunc                   func() map[string]string
-	CloseFunc                    func() error
-	SaveCredentialsFunc          func(creds types.Credentials) error
-	GetUserByEmailFunc           func(email string) (types.Credentials, error)
-	CheckEmailFunc               func(email string) error
-	SaveUserProfileFunc          func(user types.User) error
-	GetUserByIDFunc              func(userID uuid.UUID) (types.User, error)
-	UpdateRocketPointsFunc       func(userID uuid.UUID, rocketPoints int) error
-	GetRocketPointsByUserIDFunc  func(userID uuid.UUID) (int, error)
-	GetUserIDByNameFunc          func(name string) (uuid.UUID, error)
-	GetTopUsersFunc              func(limit int) ([]types.User, error)
-	GetAllUsersFunc              func(excludeUserID *uuid.UUID) ([]types.User, error)
-	UpdateDailyStepsFunc         func(userID uuid.UUID, steps int) error
-	GetUserStatisticsFunc        func(userID uuid.UUID) ([]types.StepStatistic, error)
-	GetSettingsByUserIDFunc      func(userID uuid.UUID) (*types.Settings, error)
-	CreateSettingsFunc           func(settings types.Settings) error
-	UpdateSettingsStepGoalFunc   func(userID uuid.UUID, stepGoal int) error
-	UpdateSettingsImageFunc      func(userID uuid.UUID, imageID uuid.UUID) error
-	UpdateStepGoalFunc           func(userID uuid.UUID, stepGoal int) error
-	UpdateImageFunc              func(userID uuid.UUID, imageID uuid.UUID) error
-	SaveImageFunc                func(filename string, data []byte) (uuid.UUID, error)
-	GetUserImageFunc             func(userID uuid.UUID) (*types.UserImage, error)
-	GetAllChallengesFunc         func() ([]types.Challenge, error)
-	AssignChallengesToUserFunc   func(userID uuid.UUID, challenges []types.Challenge) error
-	GetUserDailyChallengesFunc   func(userID uuid.UUID) ([]types.Challenge, error)
-	ResetDailyChallengesFunc     func() error
-	InsertChallengeFunc          func(challenge types.Challenge) error
-	CompleteChallengeFunc        func(userID uuid.UUID, dto types.CompleteChallengesDTO) error
-	IsNewDayForUserFunc          func(userID uuid.UUID) (bool, error)
-	CleanUpChallengesForUserFunc func(userID uuid.UUID) error
-	AddFriendFunc                func(userID, friendID uuid.UUID) error
-	GetFriendsFunc               func(userID uuid.UUID) ([]types.User, error)
-	GetFriendsRankedByPointsFunc func(userID uuid.UUID) ([]types.User, error)
-	DeleteFriendFunc             func(userID, friendID uuid.UUID) error
-	SaveRunFunc                  func(userID uuid.UUID, route string, duration string, distance float64) error
-	GetAllRunsByUserFunc         func(userID uuid.UUID) ([]types.RunDTO, error)
-	DeleteRunFunc                func(runID uuid.UUID) error
+	ExecuteRawSQLFunc                  func(query string) (sql.Result, error)
+	QueryRowFunc                       func(query string, args ...interface{}) *sql.Row
+	HealthFunc                         func() map[string]string
+	CloseFunc                          func() error
+	SaveCredentialsFunc                func(creds types.Credentials) error
+	GetUserByEmailFunc                 func(email string) (types.Credentials, error)
+	CheckEmailFunc                     func(email string) error
+	SaveUserProfileFunc                func(user types.User) error
+	GetUserByIDFunc                    func(userID uuid.UUID) (types.User, error)
+	UpdateRocketPointsFunc             func(userID uuid.UUID, rocketPoints int) error
+	GetRocketPointsByUserIDFunc        func(userID uuid.UUID) (int, error)
+	GetUserIDByNameFunc                func(name string) (uuid.UUID, error)
+	GetTopUsersFunc                    func(limit int) ([]types.User, error)
+	GetAllUsersFunc                    func(excludeUserID *uuid.UUID) ([]types.User, error)
+	UpdateDailyStepsFunc               func(userID uuid.UUID, steps int) error
+	GetUserStatisticsFunc              func(userID uuid.UUID) ([]types.StepStatistic, error)
+	GetSettingsByUserIDFunc            func(userID uuid.UUID) (*types.Settings, error)
+	CreateSettingsFunc                 func(settings types.Settings) error
+	UpdateSettingsStepGoalFunc         func(userID uuid.UUID, stepGoal int) error
+	UpdateSettingsImageFunc            func(userID uuid.UUID, imageID uuid.UUID) error
+	UpdateStepGoalFunc                 func(userID uuid.UUID, stepGoal int) error
+	UpdateImageFunc                    func(userID uuid.UUID, imageID uuid.UUID) error
+	SaveImageFunc                      func(filename string, data []byte) (uuid.UUID, error)
+	GetUserImageFunc                   func(userID uuid.UUID) (*types.UserImage, error)
+	GetAllChallengesFunc               func() ([]types.Challenge, error)
+	AssignChallengesToUserFunc         func(userID uuid.UUID, challenges []types.Challenge) error
+	GetUserDailyChallengesFunc         func(userID uuid.UUID) ([]types.Challenge, error)
+	ResetDailyChallengesFunc           func() error
+	InsertChallengeFunc                func(challenge types.Challenge) error
+	CompleteChallengeFunc              func(userID uuid.UUID, dto types.CompleteChallengesDTO) error
+	IsNewDayForUserFunc                func(userID uuid.UUID) (bool, error)
+	CleanUpChallengesForUserFunc       func(userID uuid.UUID) error
+	AddFriendFunc                      func(userID, friendID uuid.UUID) error
+	GetFriendsFunc                     func(userID uuid.UUID) ([]types.User, error)
+	GetFriendsRankedByPointsFunc       func(userID uuid.UUID) ([]types.User, error)
+	DeleteFriendFunc                   func(userID, friendID uuid.UUID) error
+	SaveRunFunc                        func(userID uuid.UUID, route string, duration string, distance float64) error
+	GetAllRunsByUserFunc               func(userID uuid.UUID) ([]types.RunDTO, error)
+	DeleteRunFunc                      func(runID uuid.UUID) error
+	GetChallengeByIDFunc               func(challengeID uuid.UUID) (*types.Challenge, error)
+	SaveActivityFunc                   func(userID uuid.UUID, message string) error
+	GetActivitiesForUserAndFriendsFunc func(userID uuid.UUID) ([]types.ActivityWithUser, error)
 }
 
 func (m *MockDB) ExecuteRawSQL(query string) (sql.Result, error) {
@@ -303,6 +306,27 @@ func (m *MockDB) GetAllUsers(userId *uuid.UUID) ([]types.User, error) {
 	return nil, nil
 }
 
+func (m *MockDB) GetChallengeByID(challengeID uuid.UUID) (*types.Challenge, error) {
+	if m.GetChallengeByIDFunc != nil {
+		return m.GetChallengeByIDFunc(challengeID)
+	}
+	return nil, nil
+}
+
+func (m *MockDB) SaveActivity(userID uuid.UUID, message string) error {
+	if m.SaveActivityFunc != nil {
+		return m.SaveActivityFunc(userID, message)
+	}
+	return nil
+}
+
+func (m *MockDB) GetActivitiesForUserAndFriends(userID uuid.UUID) ([]types.ActivityWithUser, error) {
+	if m.GetActivitiesForUserAndFriendsFunc != nil {
+		return m.GetActivitiesForUserAndFriendsFunc(userID)
+	}
+	return nil, nil
+}
+
 func (m *MockDB) SaveRun(userID uuid.UUID, route string, duration string, distance float64) error {
 	if m.SaveRunFunc != nil {
 		return m.SaveRun(userID, route, duration, distance)

rocket-backend/integration-tests/server-tests/middleware_test.go

@@ -45,7 +45,7 @@ var _ = Describe("AuthMiddleware", func() {
 			router.ServeHTTP(recorder, req)
 
 			Expect(recorder.Code).To(Equal(http.StatusUnauthorized))
-			Expect(recorder.Body.String()).To(ContainSubstring("Authorization header required"))
+			Expect(recorder.Body.String()).To(ContainSubstring("Authorization header or jwt_token cookie required"))
 		})
 	})
 

rocket-backend/internal/database/activities_table.go

@@ -0,0 +1,68 @@
+package database
+
+import (
+	"fmt"
+	"rocket-backend/internal/custom_error"
+	"rocket-backend/internal/types"
+	"rocket-backend/pkg/logger"
+	"time"
+
+	"github.com/google/uuid"
+)
+
+func (s *service) SaveActivity(userID uuid.UUID, message string) error {
+	id := uuid.New()
+	now := time.Now()
+
+	query := `
+		INSERT INTO activities (id, user_id, time, message)
+		VALUES ($1, $2, $3, $4)
+	`
+	_, err := s.db.Exec(query, id, userID, now, message)
+	if err != nil {
+		logger.Error(fmt.Sprintf("Failed to save activity: %v", err))
+		return fmt.Errorf("%w: %v", custom_error.ErrFailedToSave, err)
+	}
+	return nil
+}
+
+func (s *service) GetActivitiesForUserAndFriends(userID uuid.UUID) ([]types.ActivityWithUser, error) {
+	query := `
+		SELECT
+			a.user_id,
+			CASE WHEN a.user_id = $1 THEN 'You' ELSE u.username END AS name,
+			a.time,
+			a.message
+		FROM activities a
+		JOIN users u ON a.user_id = u.id
+		WHERE
+			(a.user_id = $1
+			OR a.user_id IN (
+				SELECT friend_id FROM friends WHERE user_id = $1
+			))
+			AND a.time::date = CURRENT_DATE
+		ORDER BY a.time DESC
+	`
+	rows, err := s.db.Query(query, userID)
+	if err != nil {
+		logger.Error(fmt.Sprintf("Failed to fetch activities for user and friends: %v", err))
+		return nil, custom_error.ErrFailedToRetrieveData
+	}
+	defer rows.Close()
+
+	var activities []types.ActivityWithUser
+	for rows.Next() {
+		var activity types.ActivityWithUser
+		var uid uuid.UUID
+		if err := rows.Scan(&uid, &activity.Name, &activity.Time, &activity.Message); err != nil {
+			logger.Error(fmt.Sprintf("Failed to scan activity row: %v", err))
+			return nil, custom_error.ErrDatabaseQuery
+		}
+		activities = append(activities, activity)
+	}
+	if err := rows.Err(); err != nil {
+		logger.Error(fmt.Sprintf("Error iterating over activity rows: %v", err))
+		return nil, custom_error.ErrDatabaseQuery
+	}
+	return activities, nil
+}

rocket-backend/internal/database/challenges_table.go

@@ -219,3 +219,19 @@ func (s *service) CleanUpChallengesForUser(userID uuid.UUID) error {
 
 	return nil
 }
+
+func (s *service) GetChallengeByID(challengeID uuid.UUID) (*types.Challenge, error) {
+	query := `
+		SELECT id, description AS text, points_reward AS points
+		FROM challenges
+		WHERE id = $1
+	`
+	var challenge types.Challenge
+	err := s.db.QueryRow(query, challengeID).Scan(&challenge.ID, &challenge.Text, &challenge.Points)
+	if err != nil {
+		logger.Error("Failed to fetch challenge by ID", err)
+		return nil, fmt.Errorf("failed to fetch challenge by ID: %v", err)
+	}
+
+	return &challenge, nil
+}

rocket-backend/internal/database/database.go

@@ -68,6 +68,7 @@ type Service interface {
 	CompleteChallenge(UserID uuid.UUID, dto types.CompleteChallengesDTO) error
 	IsNewDayForUser(userID uuid.UUID) (bool, error)
 	CleanUpChallengesForUser(userID uuid.UUID) error
+	GetChallengeByID(challengeID uuid.UUID) (*types.Challenge, error)
 
 	// friends
 	AddFriend(userID, friendID uuid.UUID) error
@@ -79,6 +80,10 @@ type Service interface {
 	SaveRun(userID uuid.UUID, route string, duration string, distance float64) error
 	GetAllRunsByUser(userID uuid.UUID) ([]types.RunDTO, error)
 	DeleteRun(runID uuid.UUID) error
+
+	// activities
+	SaveActivity(userID uuid.UUID, message string) error
+	GetActivitiesForUserAndFriends(userID uuid.UUID) ([]types.ActivityWithUser, error)
 }
 
 type service struct {

rocket-backend/internal/server/activity_handlers.go

@@ -0,0 +1,35 @@
+package server
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
+)
+
+func (s *Server) GetActivityHandler(c *gin.Context) {
+	userID, exists := c.Get("userID")
+	if !exists {
+		c.JSON(http.StatusUnauthorized, gin.H{"error": "User not authenticated"})
+		return
+	}
+
+	userUUID, err := uuid.Parse(userID.(string))
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid user ID format"})
+		return
+	}
+
+	activities, err := s.db.GetActivitiesForUserAndFriends(userUUID)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to fetch activities"})
+		return
+	}
+
+	user, err := s.db.GetUserByID(userUUID)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to fetch user data"})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{"username": user.Username ,"activities": activities})
+}

rocket-backend/internal/server/challenge_handlers.go

@@ -83,5 +83,15 @@ func (s *Server) CompleteChallengeHandler(c *gin.Context) {
 		return
 	}
 
+	// save activity
+	challenge, err := s.db.GetChallengeByID(pointsDTO.ChallengeID)
+	if err != nil {
+		challenge.Text = "Unknown challenge"
+	}
+
+	message := "Completed a daily challenge: " + challenge.Text
+	err = s.db.SaveActivity(userUUID, message)
+
+
 	c.JSON(http.StatusOK, gin.H{"message": "Challenge completed successfully"})
 }

rocket-backend/internal/server/middleware.go

@@ -16,13 +16,20 @@ func (s *Server) AuthMiddleware() gin.HandlerFunc {
 
 	return func(c *gin.Context) {
 		authHeader := c.GetHeader("Authorization")
-		if authHeader == "" {
-			c.JSON(http.StatusUnauthorized, gin.H{"error": "Authorization header required"})
-			c.Abort()
-			return
+		var tokenString string
+
+		if authHeader != "" {
+			tokenString = strings.TrimPrefix(authHeader, "Bearer ")
+		} else {
+			cookie, err := c.Cookie("jwt_token")
+			if err != nil || cookie == "" {
+				c.JSON(http.StatusUnauthorized, gin.H{"error": "Authorization header or jwt_token cookie required"})
+				c.Abort()
+				return
+			}
+			tokenString = cookie
 		}
 
-		tokenString := strings.TrimPrefix(authHeader, "Bearer ")
 		token, err := authService.ParseToken(tokenString)
 		if err != nil || !token.Valid {
 			c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid token"})

rocket-backend/internal/server/public_handlers.go

@@ -123,3 +123,8 @@ func (s *Server) RegisterHandler(c *gin.Context) {
 
 	c.JSON(http.StatusOK, gin.H{"message": "User registered successfully"})
 }
+
+func (s *Server) LogoutHandler(c *gin.Context) {
+	c.SetCookie("jwt_token", "", -1, "/", "", true, true)
+	c.JSON(http.StatusOK, gin.H{"message": "Logged out successfully"})
+}