fix: naming

goto · Oct 8, 2024 · 3214d87 · 3214d87
1 parent 44019f4
commit 3214d87
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/core/user/mocks/user_repository.go b/core/user/mocks/user_repository.go
diff --git a/core/user/service.go b/core/user/service.go
@@ -215,7 +215,7 @@ func (s Service) FetchCurrentUser(ctx context.Context) (User, error) {
 
 func (s Service) Delete(ctx context.Context, id string) error {
 	if uuid.IsValid(id) {
-		return s.repository.DeleteById(ctx, id, s.config.InactiveEmailTag)
+		return s.repository.DeleteByID(ctx, id, s.config.InactiveEmailTag)
 	}
 	return s.repository.DeleteByEmail(ctx, id, s.config.InactiveEmailTag)
 }
diff --git a/core/user/service_test.go b/core/user/service_test.go
@@ -705,7 +705,7 @@ func TestService_DeleteUser(t *testing.T) {
 				repository := &mocks.Repository{}
 				activityService := &mocks.ActivityService{}
 				repository.EXPECT().
-					DeleteById(mock.Anything, testUserID, emailTag).
+					DeleteByID(mock.Anything, testUserID, emailTag).
 					Return(user.ErrNotExist)
 				return user.NewService(logger, user.Config{InactiveEmailTag: emailTag}, repository, activityService)
 			},

diff --git a/core/user/user.go b/core/user/user.go
@@ -22,7 +22,7 @@ type Repository interface {
 	UpdateByEmail(ctx context.Context, toUpdate User) (User, error)
 	CreateMetadataKey(ctx context.Context, key UserMetadataKey) (UserMetadataKey, error)
 	DeleteByEmail(ctx context.Context, email string, emailTag string) error
-	DeleteById(ctx context.Context, id string, emailTag string) error
+	DeleteByID(ctx context.Context, id string, emailTag string) error
 }
 
 type User struct {

diff --git a/internal/store/postgres/user_repository.go b/internal/store/postgres/user_repository.go
@@ -683,7 +683,7 @@ func (r UserRepository) DeleteByEmail(ctx context.Context, email string, emailTa
 	return nil
 }
 
-func (r UserRepository) DeleteById(ctx context.Context, id string, emailTag string) error {
+func (r UserRepository) DeleteByID(ctx context.Context, id string, emailTag string) error {
 	user, err := r.GetByID(ctx, id)
 	if err != nil {
 		return err

diff --git a/internal/store/postgres/user_repository_test.go b/internal/store/postgres/user_repository_test.go
@@ -640,7 +640,7 @@ func (s *UserRepositoryTestSuite) TestDeleteByID() {
 
 	for _, tc := range testCases {
 		s.Run(tc.Description, func() {
-			err := s.repository.DeleteById(s.ctx, tc.Email, emailTag)
+			err := s.repository.DeleteByID(s.ctx, tc.Email, emailTag)
 			if tc.Err != nil && tc.Err.Error() != "" {
 				if errors.Unwrap(err) == tc.Err {
 					s.T().Fatalf("got error %s, expected was %s", err.Error(), tc.Err)