fix: visivle not required, adopt remove pet_id body

isd-sgcu · Feb 17, 2024 · 7164624 · 7164624
1 parent 11d4613
commit 7164624
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 23 deletions.
diff --git a/src/app/dto/pet.dto.go b/src/app/dto/pet.dto.go
@@ -72,7 +72,7 @@ type CreatePetRequest struct {
 }
 
 type ChangeViewPetRequest struct {
-	Visible bool `json:"visible" validate:"required"`
+	Visible bool `json:"visible"`
 }
 
 type ChangeViewPetResponse struct {
@@ -81,7 +81,6 @@ type ChangeViewPetResponse struct {
 
 type AdoptByRequest struct {
 	UserID string `json:"user_id" validate:"required"`
-	PetID  string `json:"pet_id" validate:"required"`
 }
 
 type AdoptByResponse struct {

diff --git a/src/app/service/pet/pet.service.go b/src/app/service/pet/pet.service.go
@@ -317,7 +317,7 @@ func (s *Service) Adopt(petId string, in *dto.AdoptByRequest) (result *dto.Adopt
 
 	res, errRes := s.petClient.AdoptPet(ctx, &petproto.AdoptPetRequest{
 		UserId: in.UserID,
-		PetId:  in.PetID,
+		PetId:  petId,
 	})
 	if errRes != nil {
 		st, _ := status.FromError(errRes)

diff --git a/src/app/service/pet/pet.service_test.go b/src/app/service/pet/pet.service_test.go
@@ -219,7 +219,6 @@ func (t *PetServiceTest) SetupTest() {
 
 	t.AdoptDto = &dto.AdoptByRequest{
 		UserID: t.Pet.AdoptBy,
-		PetID:  t.Pet.Id,
 	}
 
 	t.FindAllImageReq = &imgproto.FindAllImageRequest{}

diff --git a/src/docs/docs.go b/src/docs/docs.go
@@ -951,13 +951,9 @@ const docTemplate = `{
         "dto.AdoptByRequest": {
             "type": "object",
             "required": [
-                "pet_id",
                 "user_id"
             ],
             "properties": {
-                "pet_id": {
-                    "type": "string"
-                },
                 "user_id": {
                     "type": "string"
                 }
@@ -985,9 +981,6 @@ const docTemplate = `{
         },
         "dto.ChangeViewPetRequest": {
             "type": "object",
-            "required": [
-                "visible"
-            ],
             "properties": {
                 "visible": {
                     "type": "boolean"
@@ -1146,6 +1139,9 @@ const docTemplate = `{
                 "object_key": {
                     "type": "string"
                 },
+                "pet_id": {
+                    "type": "string"
+                },
                 "url": {
                     "type": "string"
                 }

diff --git a/src/docs/swagger.json b/src/docs/swagger.json
@@ -947,13 +947,9 @@
         "dto.AdoptByRequest": {
             "type": "object",
             "required": [
-                "pet_id",
                 "user_id"
             ],
             "properties": {
-                "pet_id": {
-                    "type": "string"
-                },
                 "user_id": {
                     "type": "string"
                 }
@@ -981,9 +977,6 @@
         },
         "dto.ChangeViewPetRequest": {
             "type": "object",
-            "required": [
-                "visible"
-            ],
             "properties": {
                 "visible": {
                     "type": "boolean"
@@ -1142,6 +1135,9 @@
                 "object_key": {
                     "type": "string"
                 },
+                "pet_id": {
+                    "type": "string"
+                },
                 "url": {
                     "type": "string"
                 }

diff --git a/src/docs/swagger.yaml b/src/docs/swagger.yaml
@@ -1,12 +1,9 @@
 definitions:
   dto.AdoptByRequest:
     properties:
-      pet_id:
-        type: string
       user_id:
         type: string
     required:
-    - pet_id
     - user_id
     type: object
   dto.AdoptByResponse:
@@ -26,8 +23,6 @@ definitions:
     properties:
       visible:
         type: boolean
-    required:
-    - visible
     type: object
   dto.ChangeViewPetResponse:
     properties:
@@ -130,6 +125,8 @@ definitions:
         type: string
       object_key:
         type: string
+      pet_id:
+        type: string
       url:
         type: string
     type: object