Merge branch 'develop' of github.com:go-park-mail-ru/2023_2_Hamster i…

…nto develop
go-park-mail-ru · Nov 8, 2023 · 5edceca · 5edceca
2 parents 213bec9 + 8d3b5d4
commit 5edceca
Show file tree

Hide file tree

Showing 11 changed files with 232 additions and 67 deletions.
diff --git a/.env b/.env
@@ -2,11 +2,11 @@ SECRET="vzqqEH6o5so_VGJZoLhrfdrH7Y7kvFe-7N2i3I3w314=п"
 
 DB_CONTAINER_NAME=HammyWallet_DB
 DB_NAME=HammyWallets
-DB_USER=kossmatoff
+DB_USER=hamster
 DB_PASSWORD=2003
 DB_HOST=0.0.0.0
 DB_SSLMODE=disable
-DB_PORT=5436
+DB_PORT=5432
 
 SERVER_NAME=HammyWallet_API
 SERVER_HOST=127.0.0.1

diff --git a/cmd/api/init/db/postgresql/schema/initdb.sql b/cmd/api/init/db/postgresql/schema/initdb.sql
@@ -45,30 +45,6 @@ CREATE TABLE TransactionCategory (
     category_id UUID REFERENCES Category(id),
     PRIMARY KEY (transaction_id, category_id)
 );
---=============================================================================
-
-ALTER TABLE Users
-ALTER COLUMN planned_budget SET DEFAULT 0.0;
-
---=============================================================================
-
-INSERT INTO "users"(login, username, password_hash, planned_budget)
-VALUES ('kossmatof','komarov', '$argon2id$v=19$m=65536,t=1,p=4$m8qhM3XLae+RCTGirBFEww$Znu5RBnxlam2xRoVtwBzbdSrN4/sRCm1IMOVX4N2uxw', 10000);
-
-INSERT INTO "users"(login, username, password_hash, planned_budget)
-VALUES ('test','test1', '$argon2id$v=19$m=65536,t=1,p=4$m8qhM3XLae+RCTGirBFEww$Znu5RBnxlam2xRoVtwBzbdSrN4/sRCm1IMOVX4N2uxw', 10000);
-
-INSERT INTO "accounts"(user_id, balance, mean_payment)
-VALUES ((SELECT id FROM Users limit 1), 1000, 'Кошелек');
-
-INSERT INTO "accounts"(user_id, balance, mean_payment)
-VALUES ((SELECT id FROM Users limit 1), 1000, 'Наличка');
-
-INSERT INTO "category"(user_id, name)
-VALUES ((SELECT id FROM Users limit 1), 'ЖКХ');
-
-INSERT INTO "category"(user_id, name)
-VALUES ((SELECT id FROM Users limit 1), 'Стипендия');
 
 CREATE OR REPLACE FUNCTION add_default_categoies()
 RETURNS TRIGGER AS $$
@@ -94,4 +70,23 @@ $$ LANGUAGE plpgsql;
 CREATE OR REPLACE TRIGGER after_user_created
     AFTER INSERT ON users
     FOR EACH ROW
-EXECUTE FUNCTION add_default_categoies();
+EXECUTE FUNCTION add_default_categoies();
+--=============================================================================
+
+ALTER TABLE Users
+ALTER COLUMN planned_budget SET DEFAULT 0.0;
+
+--=============================================================================
+
+INSERT INTO "users"(login, username, password_hash, planned_budget)
+VALUES ('kossmatof','komarov', '$argon2id$v=19$m=65536,t=1,p=4$m8qhM3XLae+RCTGirBFEww$Znu5RBnxlam2xRoVtwBzbdSrN4/sRCm1IMOVX4N2uxw', 10000);
+
+INSERT INTO "users"(login, username, password_hash, planned_budget)
+VALUES ('test','test1', '$argon2id$v=19$m=65536,t=1,p=4$m8qhM3XLae+RCTGirBFEww$Znu5RBnxlam2xRoVtwBzbdSrN4/sRCm1IMOVX4N2uxw', 10000);
+
+INSERT INTO "accounts"(user_id, balance, mean_payment)
+VALUES ((SELECT id FROM Users limit 1), 1000, 'Кошелек');
+
+INSERT INTO "accounts"(user_id, balance, mean_payment)
+VALUES ((SELECT id FROM Users limit 1), 1000, 'Наличка');
+
diff --git a/cmd/api/init/router/router.go b/cmd/api/init/router/router.go
@@ -89,6 +89,8 @@ func InitRouter(auth *auth.Handler,
 	}
 
 	categoryRouter := apiRouter.PathPrefix("/tag").Subrouter()
+	categoryRouter.Use(authMid.Authentication)
+	categoryRouter.Use(csrfMid.CheckCSRF)
 	{
 		categoryRouter.Methods("POST").Path("/create").HandlerFunc(category.CreateTag)
 		categoryRouter.Methods("GET").Path("/all").HandlerFunc(category.GetTags)

diff --git a/docs/docs.go b/docs/docs.go
@@ -289,7 +289,7 @@ const docTemplate = `{
                     "200": {
                         "description": "tag with id creted",
                         "schema": {
-                            "$ref": "#/definitions/http.Response-uuid_UUID"
+                            "$ref": "#/definitions/http.Response-category_CategoryCreateResponse"
                         }
                     },
                     "400": {
@@ -1060,6 +1060,14 @@ const docTemplate = `{
                 }
             }
         },
+        "category.CategoryCreateResponse": {
+            "type": "object",
+            "properties": {
+                "category_id": {
+                    "type": "string"
+                }
+            }
+        },
         "category.TagInput": {
             "type": "object",
             "properties": {
@@ -1168,6 +1176,17 @@ const docTemplate = `{
                 }
             }
         },
+        "http.Response-category_CategoryCreateResponse": {
+            "type": "object",
+            "properties": {
+                "body": {
+                    "$ref": "#/definitions/category.CategoryCreateResponse"
+                },
+                "status": {
+                    "type": "integer"
+                }
+            }
+        },
         "http.Response-http_MasTransaction": {
             "type": "object",
             "properties": {
@@ -1311,17 +1330,6 @@ const docTemplate = `{
                 }
             }
         },
-        "http.Response-uuid_UUID": {
-            "type": "object",
-            "properties": {
-                "body": {
-                    "type": "string"
-                },
-                "status": {
-                    "type": "integer"
-                }
-            }
-        },
         "http.ResponseError": {
             "type": "object",
             "properties": {

diff --git a/docs/swagger.json b/docs/swagger.json
@@ -283,7 +283,7 @@
                     "200": {
                         "description": "tag with id creted",
                         "schema": {
-                            "$ref": "#/definitions/http.Response-uuid_UUID"
+                            "$ref": "#/definitions/http.Response-category_CategoryCreateResponse"
                         }
                     },
                     "400": {
@@ -1054,6 +1054,14 @@
                 }
             }
         },
+        "category.CategoryCreateResponse": {
+            "type": "object",
+            "properties": {
+                "category_id": {
+                    "type": "string"
+                }
+            }
+        },
         "category.TagInput": {
             "type": "object",
             "properties": {
@@ -1162,6 +1170,17 @@
                 }
             }
         },
+        "http.Response-category_CategoryCreateResponse": {
+            "type": "object",
+            "properties": {
+                "body": {
+                    "$ref": "#/definitions/category.CategoryCreateResponse"
+                },
+                "status": {
+                    "type": "integer"
+                }
+            }
+        },
         "http.Response-http_MasTransaction": {
             "type": "object",
             "properties": {
@@ -1305,17 +1324,6 @@
                 }
             }
         },
-        "http.Response-uuid_UUID": {
-            "type": "object",
-            "properties": {
-                "body": {
-                    "type": "string"
-                },
-                "status": {
-                    "type": "integer"
-                }
-            }
-        },
         "http.ResponseError": {
             "type": "object",
             "properties": {

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -14,6 +14,11 @@ definitions:
       username:
         type: string
     type: object
+  category.CategoryCreateResponse:
+    properties:
+      category_id:
+        type: string
+    type: object
   category.TagInput:
     properties:
       name:
@@ -84,6 +89,13 @@ definitions:
       status:
         type: integer
     type: object
+  http.Response-category_CategoryCreateResponse:
+    properties:
+      body:
+        $ref: '#/definitions/category.CategoryCreateResponse'
+      status:
+        type: integer
+    type: object
   http.Response-http_MasTransaction:
     properties:
       body:
@@ -175,13 +187,6 @@ definitions:
       status:
         type: integer
     type: object
-  http.Response-uuid_UUID:
-    properties:
-      body:
-        type: string
-      status:
-        type: integer
-    type: object
   http.ResponseError:
     properties:
       message:
@@ -568,7 +573,7 @@ paths:
         "200":
           description: tag with id creted
           schema:
-            $ref: '#/definitions/http.Response-uuid_UUID'
+            $ref: '#/definitions/http.Response-category_CategoryCreateResponse'
         "400":
           description: Incorrect Input
           schema:

diff --git a/internal/microservices/category/category_models.go b/internal/microservices/category/category_models.go
@@ -21,3 +21,7 @@ type (
 		Regular     bool      `json:"regular" valid:"-"`
 	}
 )
+
+type CategoryCreateResponse struct {
+	CategoryID uuid.UUID `json:"category_id"`
+}
diff --git a/internal/microservices/category/delivery/http/handlers.go b/internal/microservices/category/delivery/http/handlers.go
@@ -30,7 +30,7 @@ func NewHandler(cu category.Usecase, log logger.Logger) *Handler {
 // @Accept 		json
 // @Produce		json
 // @Param			tag		body		category.TagInput		true		"tag info"
-// @Success		200		{object}	Response[uuid.UUID]				"tag with id creted"
+// @Success		200		{object}	Response[category.CategoryCreateResponse]				"tag with id creted"
 // @Failure		400		{object}	ResponseError					"Incorrect Input"
 // @Failure		401		{object}	ResponseError					"auth error relogin"
 // @Failure		429		{object}	ResponseError					"Server error"
@@ -65,7 +65,8 @@ func (h *Handler) CreateTag(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	response.SuccessResponse(w, http.StatusOK, id)
+	categoryResponse := category.CategoryCreateResponse{CategoryID: id}
+	response.SuccessResponse(w, http.StatusOK, categoryResponse)
 }
 
 // @Summary		Get Tags

diff --git a/internal/microservices/category/repository/postgres/postgres.go b/internal/microservices/category/repository/postgres/postgres.go
@@ -135,7 +135,7 @@ func (r *Repository) GetTags(ctx context.Context, userID uuid.UUID) ([]models.Ca
 	}
 
 	if err := rows.Err(); err != nil {
-		return nil, err
+		return nil, fmt.Errorf("[repo] Error rows error: %v", err)
 	}
 
 	if len(categories) == 0 {