feat: change conditionID column nullable

pet-sitter · May 1, 2024 · d270a10 · d270a10
1 parent 6db15cb
commit d270a10
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/internal/domain/sospost/view.go b/internal/domain/sospost/view.go
@@ -18,7 +18,7 @@ type WriteSOSPostRequest struct {
 	CareType     CareType      `json:"careType" validate:"required,oneof=foster visiting"`
 	CarerGender  CarerGender   `json:"carerGender" validate:"required,oneof=male female all"`
 	RewardType   RewardType    `json:"rewardType" validate:"required,oneof=fee gifticon negotiable"`
-	ConditionIDs []int         `json:"conditionIds" validate:"required,gte=1"`
+	ConditionIDs []int         `json:"conditionIds" validate:"required"`
 	PetIDs       []int64       `json:"petIds" validate:"required,gte=1"`
 }
 
@@ -165,7 +165,7 @@ type UpdateSOSPostRequest struct {
 	CareType     CareType      `json:"careType" validate:"required,oneof=foster visiting"`
 	CarerGender  CarerGender   `json:"carerGender" validate:"required,oneof=male female all"`
 	RewardType   RewardType    `json:"rewardType" validate:"required,oneof=fee gifticon negotiable"`
-	ConditionIDs []int         `json:"conditionIds" validate:"required,gte=1"`
+	ConditionIDs []int         `json:"conditionIds" validate:"required"`
 	PetIDs       []int         `json:"petIds" validate:"required,gte=1"`
 }
 

diff --git a/internal/postgres/sos_post_store.go b/internal/postgres/sos_post_store.go
@@ -228,8 +228,12 @@ func readSOSPostRows(rows *sql.Rows, page, size int) (*sospost.SOSPostInfoList,
 		} else {
 			sosPost.Media = media.ViewListForSOSPost{}
 		}
-		if err := json.Unmarshal(conditionsData, &sosPost.Conditions); err != nil {
-			return nil, pnd.FromPostgresError(err)
+		if len(conditionsData) > 0 {
+			if err := json.Unmarshal(conditionsData, &sosPost.Conditions); err != nil {
+				return nil, pnd.FromPostgresError(err)
+			}
+		} else {
+			sosPost.Conditions = soscondition.ViewListForSOSPost{}
 		}
 		sosPostList.Items = append(sosPostList.Items, sosPost)
 	}