Merge branch 'last-online' into 'master'

Last online

See merge request joinimpact/api!77

Author: oatmilkcat

internal/authentication/service.go

@@ -38,6 +38,8 @@ type Service interface {
 	OauthLogin(serviceName, accessToken string) (*OauthResponse, error)
 	// RefreshToken generates a new token pair from a refresh token.
 	RefreshToken(ctx context.Context, refreshToken string) (*TokenPair, error)
+	// UpdateLastOnline updates a user's last online time.
+	UpdateLastOnline(ctx context.Context, userID int64) error
 }
 
 // service represents the default authentication service of this package.
@@ -371,3 +373,24 @@ func (s *service) RefreshToken(ctx context.Context, refreshToken string) (*Token
 	// No errors, generate a token pair.
 	return s.generateTokenPair(claims.UserID)
 }
+
+// UpdateLastOnline updates a user's last online time.
+func (s *service) UpdateLastOnline(ctx context.Context, userID int64) error {
+	user, err := s.userRepository.FindByID(userID)
+	if err != nil {
+		return err
+	}
+
+	if user.LastOnline != nil && time.Now().Sub(*user.LastOnline) < 30*time.Minute {
+		return nil
+	}
+
+	now := time.Now()
+
+	return s.userRepository.Update(models.User{
+		Model: models.Model{
+			ID: user.ID,
+		},
+		LastOnline: &now,
+	})
+}

internal/core/middleware/auth/middleware.go

@@ -53,6 +53,9 @@ func AuthMiddleware(authService authentication.Service) func(next http.Handler)
 			ctx = context.WithValue(ctx, KeyUserID, userID)
 
 			next.ServeHTTP(w, r.WithContext(ctx))
+
+			// Update the user's last online time.
+			authService.UpdateLastOnline(ctx, userID)
 		})
 	}
 }

internal/database/postgres/opportunity_repository.go

@@ -25,7 +25,7 @@ func NewOpportunityRepository(db *gorm.DB, logger *zerolog.Logger) models.Opport
 // FindByID finds a single entity by ID.
 func (r *opportunityRepository) FindByID(ctx context.Context, id int64) (*models.Opportunity, error) {
 	var opportunity models.Opportunity
-	if err := r.db.Preload("OpportunityRequirements").Preload("OpportunityLimits").First(&opportunity, id).Error; err != nil {
+	if err := r.db.Preload("OpportunityRequirements").Preload("OpportunityLimits").Preload("OpportunityTags").Preload("OpportunityTags.Tag").First(&opportunity, id).Error; err != nil {
 		return &opportunity, err
 	}
 	return &opportunity, nil
@@ -34,7 +34,7 @@ func (r *opportunityRepository) FindByID(ctx context.Context, id int64) (*models
 // FindByIDs finds multiple entities by an array of IDs.
 func (r *opportunityRepository) FindByIDs(ctx context.Context, ids []int64) ([]models.Opportunity, error) {
 	var opportunities []models.Opportunity
-	if err := r.db.Preload("OpportunityRequirements").Preload("OpportunityLimits").
+	if err := r.db.Preload("OpportunityRequirements").Preload("OpportunityLimits").Preload("OpportunityTags").Preload("OpportunityTags.Tag").
 		Where("id IN (?) AND active = True", ids).
 		Find(&opportunities).
 		Error; err != nil {
@@ -46,7 +46,7 @@ func (r *opportunityRepository) FindByIDs(ctx context.Context, ids []int64) ([]m
 // FindByOrganizationID finds multiple entities by the organization ID.
 func (r *opportunityRepository) FindByOrganizationID(ctx context.Context, organizationID int64) ([]models.Opportunity, error) {
 	var opportunities []models.Opportunity
-	if err := r.db.Preload("OpportunityRequirements").Preload("OpportunityLimits").
+	if err := r.db.Preload("OpportunityRequirements").Preload("OpportunityLimits").Preload("OpportunityTags").Preload("OpportunityTags.Tag").
 		Limit(dbctx.Get(ctx).Limit).
 		Offset(dbctx.Get(ctx).Page*dbctx.Get(ctx).Limit).
 		Where("organization_id = ? AND active = True AND LOWER(title) LIKE ?", organizationID, strings.ToLower(fmt.Sprintf("%%%s%%", dbctx.Get(ctx).Query))).
@@ -60,7 +60,7 @@ func (r *opportunityRepository) FindByOrganizationID(ctx context.Context, organi
 // FindByCreatorID finds multiple entities by the creator ID.
 func (r *opportunityRepository) FindByCreatorID(ctx context.Context, creatorID int64) ([]models.Opportunity, error) {
 	var opportunities []models.Opportunity
-	if err := r.db.Preload("OpportunityRequirements").Preload("OpportunityLimits").Where("creator_id = ? AND active = True", creatorID).Find(&opportunities).Error; err != nil {
+	if err := r.db.Preload("OpportunityRequirements").Preload("OpportunityLimits").Preload("OpportunityTags").Preload("OpportunityTags.Tag").Where("creator_id = ? AND active = True", creatorID).Find(&opportunities).Error; err != nil {
 		return opportunities, err
 	}
 	return opportunities, nil

internal/models/user.go

@@ -15,6 +15,7 @@ type User struct {
 	FirstName      string             `json:"firstName"`                   // the user's first name
 	LastName       string             `json:"lastName"`                    // the user's last name
 	DateOfBirth    time.Time          `json:"dateOfBirth" level:"1"`       // the user's date of birth, used for calculating age
+	LastOnline     *time.Time         `json:"lastOnline"`                  // the last time the user was online
 	ProfileFields  []UserProfileField `json:"profile"`                     // fields of the user's profile
 	// ZIPCode        string             `json:"zipCode" level:"1"`       // the user's zip code, used to find nearby opportunities
 	LocationLatitude  float64 `json:"-"` // the latitude of the user's city

internal/users/profile.go

@@ -14,6 +14,7 @@ type UserProfile struct {
 	FirstName      string                    `json:"firstName"`                           // the user's first name
 	LastName       string                    `json:"lastName"`                            // the user's last name
 	Email          string                    `json:"email,omitempty" scope:"owner"`       // the user's email
+	LastOnline     *time.Time                `json:"lastOnline,omitempty"`                // the last time the user was online
 	DateOfBirth    time.Time                 `json:"dateOfBirth,omitempty" scope:"owner"` // the user's date of birth, used for calculating age
 	CreatedAt      time.Time                 `json:"createdAt,omitempty" scope:"owner"`   // the time the user was created at
 	Tags           []models.Tag              `json:"tags"`                                // the user's tags

internal/users/service.go

@@ -78,6 +78,7 @@ func (s *service) GetUserProfile(userID int64, self bool) (*UserProfile, error)
 	profile.FirstName = user.FirstName
 	profile.LastName = user.LastName
 	profile.ProfilePicture = user.ProfilePicture
+	profile.LastOnline = user.LastOnline
 
 	if self {
 		profile.Email = user.Email
@@ -140,6 +141,7 @@ func (s *service) GetMinimalUserProfile(userID int64) (*UserProfile, error) {
 	profile.FirstName = user.FirstName
 	profile.LastName = user.LastName
 	profile.ProfilePicture = user.ProfilePicture
+	profile.LastOnline = user.LastOnline
 
 	return profile, nil
 }