fix: liked and interested

cjtim · Sep 17, 2022 · fcccd19 · fcccd19
1 parent c95be68
commit fcccd19
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 5 deletions.
diff --git a/repository/interested.go b/repository/interested.go
@@ -26,7 +26,7 @@ func (i *InterestedImpl) Add(petID int, userID uuid.UUID) error {
 }
 
 func (i *InterestedImpl) Remove(petID int, userID uuid.UUID) error {
-	stm := `DELETE "interested" WHERE pet_id = $1, user_id = $2`
+	stm := `DELETE FROM "interested" WHERE pet_id = $1 AND user_id = $2`
 	_, err := DB.Exec(stm, petID, userID)
 	return err
 }
diff --git a/repository/liked.go b/repository/liked.go
@@ -26,7 +26,7 @@ func (i *LikedImpl) Add(petID int, userID uuid.UUID) error {
 }
 
 func (i *LikedImpl) Remove(petID int, userID uuid.UUID) error {
-	stm := `DELETE "liked" WHERE pet_id = $1, user_id = $2`
+	stm := `DELETE FROM "liked" WHERE pet_id = $1 AND user_id = $2`
 	_, err := DB.Exec(stm, petID, userID)
 	return err
 }
diff --git a/repository/pet.go b/repository/pet.go
@@ -27,6 +27,8 @@ type Pet struct {
 type PetWithPic struct {
 	Pet
 	PictureURLs json.RawMessage `json:"picture_urls" db:"picture_urls"`
+	Liked       json.RawMessage `json:"liked" db:"liked"`
+	Interested  json.RawMessage `json:"interested" db:"interested"`
 }
 
 func (p *PetImpl) List() (pets []PetWithPic, err error) {
@@ -40,7 +42,23 @@ func (p *PetImpl) List() (pets []PetWithPic, err error) {
 				FROM "pic_pet" pp
 				WHERE pp.pet_id = p.id
 			) pic
-		) AS picture_urls
+		) AS picture_urls,
+		(
+			SELECT COALESCE(json_agg(user_id), '[]')
+			FROM (
+				SELECT user_id
+				FROM "liked" lk
+				WHERE lk.pet_id = p.id
+			) liked
+		) AS liked,
+		(
+			SELECT COALESCE(json_agg(user_id), '[]')
+			FROM (
+				SELECT user_id
+				FROM "interested" itrt
+				WHERE itrt.pet_id = p.id
+			) itrt
+		) AS interested
 	FROM pet p
 	`
 	err = DB.Select(&pets, stm)
@@ -58,7 +76,23 @@ func (p *PetImpl) ListByUserId(userId uuid.UUID) (pets []PetWithPic, err error)
 				FROM "pic_pet" pp
 				WHERE pp.pet_id = p.id
 			) pic
-		) AS picture_urls
+		) AS picture_urls,
+		(
+			SELECT COALESCE(json_agg(user_id), '[]')
+			FROM (
+				SELECT user_id
+				FROM "liked" lk
+				WHERE lk.pet_id = p.id
+			) liked
+		) AS liked,
+		(
+			SELECT COALESCE(json_agg(user_id), '[]')
+			FROM (
+				SELECT user_id
+				FROM "interested" itrt
+				WHERE itrt.pet_id = p.id
+			) itrt
+		) AS interested
 	FROM pet p
 	WHERE p.user_id = $1
 	`
@@ -77,7 +111,23 @@ func (p *PetImpl) GetById(id int) (pet PetWithPic, err error) {
 				FROM "pic_pet" pp
 				WHERE pp.pet_id = p.id
 			) pic
-		) AS picture_urls
+		) AS picture_urls,
+		(
+			SELECT COALESCE(json_agg(user_id), '[]')
+			FROM (
+				SELECT user_id
+				FROM "liked" lk
+				WHERE lk.pet_id = p.id
+			) liked
+		) AS liked,
+		(
+			SELECT COALESCE(json_agg(user_id), '[]')
+			FROM (
+				SELECT user_id
+				FROM "interested" itrt
+				WHERE itrt.pet_id = p.id
+			) itrt
+		) AS interested
 	FROM pet p
 	WHERE id = $1
 	`