refactor: pg to postgres

pet-sitter · Feb 3, 2024 · 57c0ccd · 57c0ccd
1 parent 120e4d7
commit 57c0ccd
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 96 deletions.
diff --git a/api/errors.go b/api/errors.go
@@ -164,7 +164,7 @@ func ErrUnknown(err error) *AppError {
 	}
 }
 
-func FromPGError(err error) *AppError {
+func FromPostgresError(err error) *AppError {
 	errStr := err.Error()
 	if strings.Contains(errStr, "no rows in result set") {
 		return ErrCustom(err, http.StatusNotFound, ErrCodeNotFound, "해당하는 자원이 없습니다")

diff --git a/internal/postgres/breed_store.go b/internal/postgres/breed_store.go
@@ -19,7 +19,7 @@ func (s *BreedPostgresStore) FindBreeds(page int, size int, petType *string) ([]
 
 	tx, err := s.db.Begin()
 	if err != nil {
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 
 	query := `
@@ -42,23 +42,23 @@ func (s *BreedPostgresStore) FindBreeds(page int, size int, petType *string) ([]
 	rows, err := tx.Query(query, petType, size, (page-1)*size)
 
 	if err != nil {
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 
 	for rows.Next() {
 		breed := &pet.Breed{}
 
 		err := rows.Scan(&breed.ID, &breed.Name, &breed.PetType, &breed.CreatedAt, &breed.UpdatedAt)
 		if err != nil {
-			return nil, pnd.FromPGError(err)
+			return nil, pnd.FromPostgresError(err)
 		}
 
 		breeds = append(breeds, breed)
 	}
 
 	err = tx.Commit()
 	if err != nil {
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 
 	return breeds, nil
@@ -67,7 +67,7 @@ func (s *BreedPostgresStore) FindBreeds(page int, size int, petType *string) ([]
 func (s *BreedPostgresStore) FindBreedByPetTypeAndName(petType pet.PetType, name string) (*pet.Breed, *pnd.AppError) {
 	tx, err := s.db.Begin()
 	if err != nil {
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 
 	breed := &pet.Breed{}
@@ -92,12 +92,12 @@ func (s *BreedPostgresStore) FindBreedByPetTypeAndName(petType pet.PetType, name
 		if err != nil {
 		}
 
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 
 	err = tx.Commit()
 	if err != nil {
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 
 	return breed, nil
@@ -106,7 +106,7 @@ func (s *BreedPostgresStore) FindBreedByPetTypeAndName(petType pet.PetType, name
 func (s *BreedPostgresStore) CreateBreed(breed *pet.Breed) (*pet.Breed, *pnd.AppError) {
 	tx, err := s.db.Begin()
 	if err != nil {
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 
 	err = tx.QueryRow(`
@@ -122,15 +122,15 @@ func (s *BreedPostgresStore) CreateBreed(breed *pet.Breed) (*pet.Breed, *pnd.App
 	if err != nil {
 		err := tx.Rollback()
 		if err != nil {
-			return nil, pnd.FromPGError(err)
+			return nil, pnd.FromPostgresError(err)
 		}
 
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 
 	err = tx.Commit()
 	if err != nil {
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 
 	return breed, nil

diff --git a/internal/postgres/condition_store.go b/internal/postgres/condition_store.go
@@ -19,37 +19,37 @@ func NewConditionPostgresStore(db *database.DB) *ConditionPostgresStore {
 func (s *ConditionPostgresStore) InitConditions(conditions []sos_post.SosCondition) (string, *pnd.AppError) {
 	tx, err := s.db.Begin()
 	if err != nil {
-		return "", pnd.FromPGError(err)
+		return "", pnd.FromPostgresError(err)
 	}
 
 	for n, v := range conditions {
 		_, err := tx.Exec(`
-			INSERT INTO sos_conditions 
+			INSERT INTO sos_conditions
 				(
 				 	id,
-					name, 
-					created_at, 
+					name,
+					created_at,
 					updated_at
 				)
 				SELECT $1, $2, now(), now()
 				WHERE NOT EXISTS (
-					SELECT 
-						1 
-					FROM 
-						sos_conditions 
-					WHERE 
+					SELECT
+						1
+					FROM
+						sos_conditions
+					WHERE
 						name = $2::VARCHAR(50)
 				);
 		`, n+1, string(v))
 		if err != nil {
 			tx.Rollback()
-			return "", pnd.FromPGError(err)
+			return "", pnd.FromPostgresError(err)
 		}
 	}
 
 	err = tx.Commit()
 	if err != nil {
-		return "", pnd.FromPGError(err)
+		return "", pnd.FromPostgresError(err)
 	}
 
 	return "condition init success", nil
@@ -60,18 +60,18 @@ func (s *ConditionPostgresStore) FindConditions() ([]sos_post.Condition, *pnd.Ap
 
 	tx, err := s.db.Begin()
 	if err != nil {
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 
 	rows, err := tx.Query(`
-		SELECT 
+		SELECT
 			id,
 			name
-		FROM 
+		FROM
 			sos_conditions
 	`)
 	if err != nil {
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 
 	for rows.Next() {
@@ -82,15 +82,15 @@ func (s *ConditionPostgresStore) FindConditions() ([]sos_post.Condition, *pnd.Ap
 			&condition.Name,
 		)
 		if err != nil {
-			return nil, pnd.FromPGError(err)
+			return nil, pnd.FromPostgresError(err)
 		}
 
 		conditions = append(conditions, condition)
 	}
 
 	err = tx.Commit()
 	if err != nil {
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 
 	return conditions, nil

diff --git a/internal/postgres/media_store.go b/internal/postgres/media_store.go
@@ -36,7 +36,7 @@ func (s *MediaPostgresStore) CreateMedia(media *media.Media) (*media.Media, *pnd
 	tx.Commit()
 
 	if err != nil {
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 
 	return media, nil
@@ -70,7 +70,7 @@ func (s *MediaPostgresStore) FindMediaByID(id int) (*media.Media, *pnd.AppError)
 	tx.Commit()
 
 	if err != nil {
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 
 	return media, nil

diff --git a/internal/postgres/pet_store.go b/internal/postgres/pet_store.go
@@ -49,7 +49,7 @@ func (s *PetPostgresStore) CreatePet(pet *pet.Pet) (*pet.Pet, *pnd.AppError) {
 	tx.Commit()
 
 	if err != nil {
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 
 	pet.BirthDate = utils.FormatDate(pet.BirthDate)
@@ -82,7 +82,7 @@ func (s *PetPostgresStore) FindPetsByOwnerID(ownerID int) ([]pet.Pet, *pnd.AppEr
 		ownerID,
 	)
 	if err != nil {
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 	defer rows.Close()
 
@@ -102,7 +102,7 @@ func (s *PetPostgresStore) FindPetsByOwnerID(ownerID int) ([]pet.Pet, *pnd.AppEr
 			&pet.CreatedAt,
 			&pet.UpdatedAt,
 		); err != nil {
-			return nil, pnd.FromPGError(err)
+			return nil, pnd.FromPostgresError(err)
 		}
 
 		pet.BirthDate = utils.FormatDate(pet.BirthDate)

diff --git a/internal/postgres/resource_media_store.go b/internal/postgres/resource_media_store.go
@@ -40,7 +40,7 @@ func (s *ResourceMediaPostgresStore) CreateResourceMedia(resourceID int, mediaID
 	tx.Commit()
 
 	if err != nil {
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 
 	return resourceMedia, nil
@@ -73,15 +73,15 @@ func (s *ResourceMediaPostgresStore) FindResourceMediaByResourceID(resourceID in
 	)
 
 	if err != nil {
-		return nil, pnd.FromPGError(err)
+		return nil, pnd.FromPostgresError(err)
 	}
 
 	for rows.Next() {
 		mediaItem := media.Media{}
 
 		err := rows.Scan(&mediaItem.ID, &mediaItem.MediaType, &mediaItem.URL, &mediaItem.CreatedAt, &mediaItem.UpdatedAt)
 		if err != nil {
-			return nil, pnd.FromPGError(err)
+			return nil, pnd.FromPostgresError(err)
 		}
 
 		mediaList = append(mediaList, mediaItem)