fix: Refactor of SaveUserActivity

app/api/usecase/project/interactor.go

@@ -188,22 +188,9 @@ func (i *interactor) GetByID(ctx context.Context, id string) (entity.Project, er
 	return i.projectRepo.Get(ctx, id)
 }
 
-// Save project info updated in user activity.
-func (i *interactor) SaveUserActivity(
-	ctx context.Context,
-	loggedUser entity.User,
-	actType entity.UserActivityType,
-	projectID, oldValue, newValue string,
-) error {
-	updateProjectInfoActVars := entity.NewActivityVarsUpdateProjectInfo(projectID, oldValue, newValue)
-	updateProjectInfoAct := entity.UserActivity{
-		Date:   i.clock.Now(),
-		UserID: loggedUser.ID,
-		Type:   actType,
-		Vars:   updateProjectInfoActVars,
-	}
-
-	err := i.userActivityRepo.Create(ctx, updateProjectInfoAct)
+// Save user activity.
+func (i *interactor) SaveUserActivity(ctx context.Context, userActivity entity.UserActivity) error {
+	err := i.userActivityRepo.Create(ctx, userActivity)
 	if err != nil {
 		return err
 	}
@@ -214,6 +201,10 @@ func (i *interactor) SaveUserActivity(
 // Update changes the desired information about a project.
 func (i *interactor) Update(ctx context.Context, opt UpdateProjectOption) (entity.Project, error) {
 	p, _ := i.projectRepo.Get(ctx, opt.ProjectID)
+	userActivity := entity.UserActivity{
+		Date:   i.clock.Now(),
+		UserID: opt.UserID,
+	}
 
 	if !kdlutil.IsNilOrEmpty(opt.Name) {
 		err := i.projectRepo.UpdateName(ctx, opt.ProjectID, *opt.Name)
@@ -222,14 +213,9 @@ func (i *interactor) Update(ctx context.Context, opt UpdateProjectOption) (entit
 		}
 
 		// Save project name updated in user activity
-		err = i.SaveUserActivity(
-			ctx,
-			opt.LoggedUser,
-			entity.UserActivityTypeUpdateProjectName,
-			opt.ProjectID,
-			p.Name,
-			*opt.Name,
-		)
+		userActivity.Type = entity.UserActivityTypeUpdateProjectName
+		userActivity.Vars = entity.NewActivityVarsUpdateProjectInfo(opt.ProjectID, p.Name, *opt.Name)
+		err = i.SaveUserActivity(ctx, userActivity)
 
 		if err != nil {
 			return entity.Project{}, err
@@ -243,14 +229,9 @@ func (i *interactor) Update(ctx context.Context, opt UpdateProjectOption) (entit
 		}
 
 		// Save project name updated in user activity
-		err = i.SaveUserActivity(
-			ctx,
-			opt.LoggedUser,
-			entity.UserActivityTypeUpdateProjectDescription,
-			opt.ProjectID,
-			p.Description,
-			*opt.Description,
-		)
+		userActivity.Type = entity.UserActivityTypeUpdateProjectDescription
+		userActivity.Vars = entity.NewActivityVarsUpdateProjectInfo(opt.ProjectID, p.Description, *opt.Description)
+		err = i.SaveUserActivity(ctx, userActivity)
 
 		if err != nil {
 			return entity.Project{}, err
@@ -264,13 +245,13 @@ func (i *interactor) Update(ctx context.Context, opt UpdateProjectOption) (entit
 		}
 
 		// Save project name updated in user activity
-		err = i.SaveUserActivity(
-			ctx, opt.LoggedUser,
-			entity.UserActivityTypeUpdateProjectArchived,
+		userActivity.Type = entity.UserActivityTypeUpdateProjectArchived
+		userActivity.Vars = entity.NewActivityVarsUpdateProjectInfo(
 			opt.ProjectID,
 			strconv.FormatBool(p.Archived),
 			strconv.FormatBool(*opt.Archived),
 		)
+		err = i.SaveUserActivity(ctx, userActivity)
 
 		if err != nil {
 			return entity.Project{}, err

app/api/usecase/project/interactor_members.go

@@ -14,7 +14,7 @@ type UpdateProjectOption struct {
 	Name        *string
 	Description *string
 	Archived    *bool
-	LoggedUser  entity.User
+	UserID      string
 }
 
 // UpdateMembersOption options when updating a project member.
@@ -101,7 +101,7 @@ func (i *interactor) AddMembers(ctx context.Context, opt AddMembersOption) (enti
 			Vars:   addMemberActVars,
 		}
 
-		err = i.userActivityRepo.Create(ctx, addMemberAct)
+		err = i.SaveUserActivity(ctx, addMemberAct)
 		if err != nil {
 			return entity.Project{}, err
 		}
@@ -159,7 +159,7 @@ func (i *interactor) RemoveMembers(ctx context.Context, opt RemoveMembersOption)
 			Vars:   removeMemberActVars,
 		}
 
-		err = i.userActivityRepo.Create(ctx, removeMemberAct)
+		err = i.SaveUserActivity(ctx, removeMemberAct)
 		if err != nil {
 			return entity.Project{}, err
 		}
@@ -226,7 +226,7 @@ func (i *interactor) UpdateMembers(ctx context.Context, opt UpdateMembersOption)
 			Vars:   updateUserAccessLevelActVars,
 		}
 
-		err = i.userActivityRepo.Create(ctx, updateUserAccessLevelAct)
+		err = i.SaveUserActivity(ctx, updateUserAccessLevelAct)
 		if err != nil {
 			return entity.Project{}, err
 		}

app/api/usecase/project/interactor_test.go

@@ -539,8 +539,7 @@ func TestInteractor_Update(t *testing.T) {
 	newArchived := true
 
 	loggedUser := entity.User{
-		ID:          "logged-user",
-		AccessLevel: entity.AccessLevelAdmin,
+		ID: "logged-user",
 	}
 
 	originalProject := entity.Project{
@@ -573,9 +572,9 @@ func TestInteractor_Update(t *testing.T) {
 	}
 
 	s.mocks.repo.EXPECT().Get(ctx, testProjectID).Return(originalProject, nil)
+	s.mocks.clock.EXPECT().Now().Return(now)
 
 	s.mocks.repo.EXPECT().UpdateName(ctx, testProjectID, newName).Return(nil)
-	s.mocks.clock.EXPECT().Now().Return(now)
 	s.mocks.userActivityRepo.EXPECT().Create(
 		ctx,
 		entity.UserActivity{
@@ -587,7 +586,6 @@ func TestInteractor_Update(t *testing.T) {
 	).Return(nil)
 
 	s.mocks.repo.EXPECT().UpdateDescription(ctx, testProjectID, newDesc).Return(nil)
-	s.mocks.clock.EXPECT().Now().Return(now)
 	s.mocks.userActivityRepo.EXPECT().Create(
 		ctx,
 		entity.UserActivity{
@@ -599,7 +597,6 @@ func TestInteractor_Update(t *testing.T) {
 	).Return(nil)
 
 	s.mocks.repo.EXPECT().UpdateArchived(ctx, testProjectID, newArchived).Return(nil)
-	s.mocks.clock.EXPECT().Now().Return(now)
 	s.mocks.userActivityRepo.EXPECT().Create(
 		ctx,
 		entity.UserActivity{
@@ -617,7 +614,7 @@ func TestInteractor_Update(t *testing.T) {
 		Name:        &newName,
 		Description: &newDesc,
 		Archived:    &newArchived,
-		LoggedUser:  loggedUser,
+		UserID:      loggedUser.ID,
 	})
 
 	require.NoError(t, err)

app/api/usecase/user/interactor.go

@@ -66,6 +66,16 @@ func NewInteractor(
 	}
 }
 
+// Save user activity.
+func (i *Interactor) SaveUserActivity(ctx context.Context, userActivity entity.UserActivity) error {
+	err := i.userActivityRepo.Create(ctx, userActivity)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // Create add a new user to the server.
 // - If the user already exists (email, username and sub must be unique) returns entity.ErrDuplicatedUser.
 // - Generates a new SSH public/private keys.
@@ -153,7 +163,7 @@ func (i *Interactor) Create(ctx context.Context, email, sub string, accessLevel
 		Vars:   createUserActVars,
 	}
 
-	err = i.userActivityRepo.Create(ctx, createUserdAct)
+	err = i.SaveUserActivity(ctx, createUserdAct)
 	if err != nil {
 		return entity.User{}, err
 	}