refactor: remove time column

pet-sitter · Feb 4, 2024 · 7eaf811 · 7eaf811
1 parent 00aac47
commit 7eaf811
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 53 deletions.
diff --git a/db/migrations/000010_remove_time_from_sos_posts.down.sql b/db/migrations/000010_remove_time_from_sos_posts.down.sql
@@ -0,0 +1,3 @@
+ALTER TABLE sos_posts
+    ADD COLUMN time_start_at TIME,
+    ADD COLUMN time_end_at TIME;
diff --git a/db/migrations/000010_remove_time_from_sos_posts.up.sql b/db/migrations/000010_remove_time_from_sos_posts.up.sql
@@ -0,0 +1,3 @@
+ALTER TABLE sos_posts
+    DROP COLUMN IF EXISTS time_start_at,
+    DROP COLUMN IF EXISTS time_end_at;
diff --git a/internal/domain/sos_post/service.go b/internal/domain/sos_post/service.go
@@ -101,8 +101,6 @@ func (service *SosPostService) WriteSosPost(fbUid string, request *WriteSosPostR
 		Reward:       sosPost.Reward,
 		DateStartAt:  sosPost.DateStartAt,
 		DateEndAt:    sosPost.DateEndAt,
-		TimeStartAt:  utils.FormatTime(sosPost.TimeStartAt),
-		TimeEndAt:    utils.FormatTime(sosPost.TimeEndAt),
 		CareType:     sosPost.CareType,
 		CarerGender:  sosPost.CarerGender,
 		RewardAmount: sosPost.RewardAmount,
@@ -184,8 +182,6 @@ func (service *SosPostService) FindSosPosts(page int, size int, sortBy string) (
 			Reward:       sosPost.Reward,
 			DateStartAt:  sosPost.DateStartAt,
 			DateEndAt:    sosPost.DateEndAt,
-			TimeStartAt:  utils.FormatTime(sosPost.TimeStartAt),
-			TimeEndAt:    utils.FormatTime(sosPost.TimeEndAt),
 			CareType:     sosPost.CareType,
 			CarerGender:  sosPost.CarerGender,
 			RewardAmount: sosPost.RewardAmount,
@@ -272,8 +268,6 @@ func (service *SosPostService) FindSosPostsByAuthorID(authorID int, page int, si
 			Reward:       sosPost.Reward,
 			DateStartAt:  sosPost.DateStartAt,
 			DateEndAt:    sosPost.DateEndAt,
-			TimeStartAt:  utils.FormatTime(sosPost.TimeStartAt),
-			TimeEndAt:    utils.FormatTime(sosPost.TimeEndAt),
 			CareType:     sosPost.CareType,
 			CarerGender:  sosPost.CarerGender,
 			RewardAmount: sosPost.RewardAmount,
@@ -357,8 +351,6 @@ func (service *SosPostService) FindSosPostByID(id int) (*FindSosPostView, *pnd.A
 		Reward:       sosPost.Reward,
 		DateStartAt:  sosPost.DateStartAt,
 		DateEndAt:    sosPost.DateEndAt,
-		TimeStartAt:  utils.FormatTime(sosPost.TimeStartAt),
-		TimeEndAt:    utils.FormatTime(sosPost.TimeEndAt),
 		CareType:     sosPost.CareType,
 		CarerGender:  sosPost.CarerGender,
 		RewardAmount: sosPost.RewardAmount,
@@ -437,8 +429,6 @@ func (service *SosPostService) UpdateSosPost(request *UpdateSosPostRequest) (*Up
 		Reward:       updateSosPost.Reward,
 		DateStartAt:  updateSosPost.DateStartAt,
 		DateEndAt:    updateSosPost.DateEndAt,
-		TimeStartAt:  utils.FormatTime(updateSosPost.TimeStartAt),
-		TimeEndAt:    utils.FormatTime(updateSosPost.TimeEndAt),
 		CareType:     updateSosPost.CareType,
 		CarerGender:  updateSosPost.CarerGender,
 		RewardAmount: updateSosPost.RewardAmount,

diff --git a/internal/domain/sos_post/sos_post.go b/internal/domain/sos_post/sos_post.go
@@ -33,8 +33,6 @@ type SosPost struct {
 	Reward       string       `field:"reward"`
 	DateStartAt  string       `field:"date_start_at"`
 	DateEndAt    string       `field:"date_end_at"`
-	TimeStartAt  time.Time    `field:"time_start_at"`
-	TimeEndAt    time.Time    `field:"time_end_at"`
 	CareType     CareType     `field:"care_type"`
 	CarerGender  CarerGender  `field:"carer_gender"`
 	RewardAmount RewardAmount `field:"reward_amount"`

diff --git a/internal/domain/sos_post/view.go b/internal/domain/sos_post/view.go
@@ -15,8 +15,6 @@ type WriteSosPostRequest struct {
 	Reward       string       `json:"reward" validate:"required"`
 	DateStartAt  time.Time    `json:"date_start_at" validate:"required"`
 	DateEndAt    time.Time    `json:"date_end_at" validate:"required"`
-	TimeStartAt  string       `json:"time_start_at" validate:"required"`
-	TimeEndAt    string       `json:"time_end_at" validate:"required"`
 	CareType     CareType     `json:"care_type" validate:"required,oneof= foster visiting"`
 	CarerGender  CarerGender  `json:"carer_gender" validate:"required,oneof=male female"`
 	RewardAmount RewardAmount `json:"reward_amount" validate:"required,oneof=hour"`
@@ -35,8 +33,6 @@ type WriteSosPostView struct {
 	Reward       string            `json:"reward"`
 	DateStartAt  string            `json:"date_start_at"`
 	DateEndAt    string            `json:"date_end_at"`
-	TimeStartAt  string            `json:"time_start_at"`
-	TimeEndAt    string            `json:"time_end_at"`
 	CareType     CareType          `json:"care_type"`
 	CarerGender  CarerGender       `json:"carer_gender"`
 	RewardAmount RewardAmount      `json:"reward_amount"`
@@ -56,8 +52,6 @@ type FindSosPostView struct {
 	Reward       string            `json:"reward"`
 	DateStartAt  string            `json:"date_start_at"`
 	DateEndAt    string            `json:"date_end_at"`
-	TimeStartAt  string            `json:"time_start_at"`
-	TimeEndAt    string            `json:"time_end_at"`
 	CareType     CareType          `json:"care_type"`
 	CarerGender  CarerGender       `json:"carer_gender"`
 	RewardAmount RewardAmount      `json:"reward_amount"`
@@ -86,8 +80,6 @@ type UpdateSosPostRequest struct {
 	Reward       string       `json:"reward" validate:"required"`
 	DateStartAt  string       `json:"date_start_at" validate:"required"`
 	DateEndAt    string       `json:"date_end_at" validate:"required"`
-	TimeStartAt  string       `json:"time_start_at" validate:"required"`
-	TimeEndAt    string       `json:"time_end_at" validate:"required"`
 	CareType     CareType     `json:"care_type" validate:"required,oneof= foster visiting"`
 	CarerGender  CarerGender  `json:"carer_gender" validate:"required,oneof=male female"`
 	RewardAmount RewardAmount `json:"reward_amount" validate:"required,oneof=hour"`
@@ -106,8 +98,6 @@ type UpdateSosPostView struct {
 	Reward       string            `json:"reward"`
 	DateStartAt  string            `json:"date_start_at"`
 	DateEndAt    string            `json:"date_end_at"`
-	TimeStartAt  string            `json:"time_start_at"`
-	TimeEndAt    string            `json:"time_end_at"`
 	CareType     CareType          `json:"care_type"`
 	CarerGender  CarerGender       `json:"carer_gender"`
 	RewardAmount RewardAmount      `json:"reward_amount"`

diff --git a/internal/postgres/sos_post_store.go b/internal/postgres/sos_post_store.go
@@ -38,16 +38,14 @@ func (s *SosPostPostgresStore) WriteSosPost(authorID int, utcDateStart string, u
 			reward,
 			date_start_at,
 			date_end_at,
-			time_start_at,
-			time_end_at,
 			care_type,
 		 	carer_gender,
 		 	reward_amount,
 		 	thumbnail_id,
 			created_at,
 			updated_at
 		)
-	VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, NOW(), NOW())
+	VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, NOW(), NOW())
 	RETURNING
 		id,
 		author_id,
@@ -56,8 +54,6 @@ func (s *SosPostPostgresStore) WriteSosPost(authorID int, utcDateStart string, u
 		reward,
 		date_start_at,
 		date_end_at,
-		time_start_at,
-		time_end_at,
 		care_type,
 		carer_gender,
 		reward_amount,
@@ -69,13 +65,21 @@ func (s *SosPostPostgresStore) WriteSosPost(authorID int, utcDateStart string, u
 		request.Reward,
 		utcDateStart,
 		utcDateEnd,
-		request.TimeStartAt,
-		request.TimeEndAt,
 		request.CareType,
 		request.CarerGender,
 		request.RewardAmount,
 		request.ImageIDs[0],
-	).Scan(&sosPost.ID, &sosPost.AuthorID, &sosPost.Title, &sosPost.Content, &sosPost.Reward, &sosPost.DateStartAt, &sosPost.DateEndAt, &sosPost.TimeStartAt, &sosPost.TimeEndAt, &sosPost.CareType, &sosPost.CarerGender, &sosPost.RewardAmount, &sosPost.ThumbnailID)
+	).Scan(&sosPost.ID,
+		&sosPost.AuthorID,
+		&sosPost.Title,
+		&sosPost.Content,
+		&sosPost.Reward,
+		&sosPost.DateStartAt,
+		&sosPost.DateEndAt,
+		&sosPost.CareType,
+		&sosPost.CarerGender,
+		&sosPost.RewardAmount,
+		&sosPost.ThumbnailID)
 
 	if err != nil {
 		tx.Rollback()
@@ -185,8 +189,6 @@ func (s *SosPostPostgresStore) FindSosPosts(page int, size int, sortBy string) (
 		reward,
 		date_start_at,
 		date_end_at,
-		time_start_at,
-		time_end_at,
 		care_type,
 		carer_gender,
 		reward_amount,
@@ -211,9 +213,22 @@ func (s *SosPostPostgresStore) FindSosPosts(page int, size int, sortBy string) (
 	for rows.Next() {
 		sosPost := sos_post.SosPost{}
 
-		err := rows.Scan(&sosPost.ID, &sosPost.AuthorID, &sosPost.Title, &sosPost.Content, &sosPost.Reward, &sosPost.DateStartAt, &sosPost.DateEndAt, &sosPost.TimeStartAt, &sosPost.TimeEndAt, &sosPost.CareType, &sosPost.CarerGender, &sosPost.RewardAmount, &sosPost.ThumbnailID, &sosPost.CreatedAt, &sosPost.UpdatedAt)
-		if err != nil {
+		err := rows.Scan(
+			&sosPost.ID,
+			&sosPost.AuthorID,
+			&sosPost.Title,
+			&sosPost.Content,
+			&sosPost.Reward,
+			&sosPost.DateStartAt,
+			&sosPost.DateEndAt,
+			&sosPost.CareType,
+			&sosPost.CarerGender,
+			&sosPost.RewardAmount,
+			&sosPost.ThumbnailID,
+			&sosPost.CreatedAt,
+			&sosPost.UpdatedAt)
 
+		if err != nil {
 			return nil, pnd.FromPostgresError(err)
 		}
 
@@ -263,8 +278,6 @@ func (s *SosPostPostgresStore) FindSosPostsByAuthorID(authorID int, page int, si
 		reward,
 		date_start_at,
 		date_end_at,
-		time_start_at,
-		time_end_at,
 		care_type,
 		carer_gender,
 		reward_amount,
@@ -289,7 +302,21 @@ func (s *SosPostPostgresStore) FindSosPostsByAuthorID(authorID int, page int, si
 	for rows.Next() {
 		sosPost := sos_post.SosPost{}
 
-		err := rows.Scan(&sosPost.ID, &sosPost.AuthorID, &sosPost.Title, &sosPost.Content, &sosPost.Reward, &sosPost.DateStartAt, &sosPost.DateEndAt, &sosPost.TimeStartAt, &sosPost.TimeEndAt, &sosPost.CareType, &sosPost.CarerGender, &sosPost.RewardAmount, &sosPost.ThumbnailID, &sosPost.CreatedAt, &sosPost.UpdatedAt)
+		err := rows.Scan(
+			&sosPost.ID,
+			&sosPost.AuthorID,
+			&sosPost.Title,
+			&sosPost.Content,
+			&sosPost.Reward,
+			&sosPost.DateStartAt,
+			&sosPost.DateEndAt,
+			&sosPost.CareType,
+			&sosPost.CarerGender,
+			&sosPost.RewardAmount,
+			&sosPost.ThumbnailID,
+			&sosPost.CreatedAt,
+			&sosPost.UpdatedAt)
+
 		if err != nil {
 			return nil, pnd.FromPostgresError(err)
 		}
@@ -319,8 +346,6 @@ func (s *SosPostPostgresStore) FindSosPostByID(id int) (*sos_post.SosPost, *pnd.
 		reward,
 		date_start_at,
 		date_end_at,
-		time_start_at,
-		time_end_at,
 		care_type,
 		carer_gender,
 		reward_amount,
@@ -340,8 +365,6 @@ func (s *SosPostPostgresStore) FindSosPostByID(id int) (*sos_post.SosPost, *pnd.
 		&sos_post.Reward,
 		&sos_post.DateStartAt,
 		&sos_post.DateEndAt,
-		&sos_post.TimeStartAt,
-		&sos_post.TimeEndAt,
 		&sos_post.CareType,
 		&sos_post.CarerGender,
 		&sos_post.RewardAmount,
@@ -482,29 +505,36 @@ func (s *SosPostPostgresStore) UpdateSosPost(request *sos_post.UpdateSosPostRequ
             reward = $3,
             date_start_at = $4,
             date_end_at = $5,
-            time_start_at = $6,
-            time_end_at = $7,
-            care_type = $8,
-            carer_gender = $9,
-            reward_amount = $10,
-            thumbnail_id = $11,
+            care_type = $6,
+            carer_gender = $7,
+            reward_amount = $8,
+            thumbnail_id = $9,
             updated_at = NOW()
         WHERE
             id = $12
-        RETURNING id, author_id, title, content, reward, date_start_at, date_end_at, time_start_at, time_end_at, care_type, carer_gender, reward_amount, thumbnail_id`,
+        RETURNING id, author_id, title, content, reward, date_start_at, date_end_at, care_type, carer_gender, reward_amount, thumbnail_id`,
 		request.Title,
 		request.Content,
 		request.Reward,
 		request.DateStartAt,
 		request.DateEndAt,
-		request.TimeStartAt,
-		request.TimeEndAt,
 		request.CareType,
 		request.CarerGender,
 		request.RewardAmount,
 		request.ImageIDs[0],
 		request.ID,
-	).Scan(&sosPost.ID, &sosPost.AuthorID, &sosPost.Title, &sosPost.Content, &sosPost.Reward, &sosPost.DateStartAt, &sosPost.DateEndAt, &sosPost.TimeStartAt, &sosPost.TimeEndAt, &sosPost.CareType, &sosPost.CarerGender, &sosPost.RewardAmount, &sosPost.ThumbnailID)
+	).Scan(
+		&sosPost.ID,
+		&sosPost.AuthorID,
+		&sosPost.Title,
+		sosPost.Content,
+		&sosPost.Reward,
+		&sosPost.DateStartAt,
+		&sosPost.DateEndAt,
+		&sosPost.CareType,
+		&sosPost.CarerGender,
+		&sosPost.RewardAmount,
+		&sosPost.ThumbnailID)
 
 	if err != nil {
 		tx.Rollback()
@@ -551,7 +581,6 @@ func (s *SosPostPostgresStore) FindConditionByID(id int) ([]sos_post.Condition,
 			&condition.UpdatedAt,
 		)
 		if err != nil {
-
 			return nil, pnd.FromPostgresError(err)
 		}
 		conditions = append(conditions, condition)
@@ -612,7 +641,6 @@ func (s *SosPostPostgresStore) FindPetsByID(id int) ([]pet.Pet, *pnd.AppError) {
 			&pet.UpdatedAt,
 		)
 		if err != nil {
-
 			return nil, pnd.FromPostgresError(err)
 		}
 		pets = append(pets, pet)