From 5e46b123a89c00ca61f5eb7fb16b593da29c5052 Mon Sep 17 00:00:00 2001 From: hanif salafi Date: Thu, 7 Nov 2024 11:31:28 +0700 Subject: [PATCH] feat: update users request createdbyid --- .../articles/request/articles.request.go | 36 +++++++++++++------ docs/swagger/docs.go | 29 +++++---------- docs/swagger/swagger.json | 29 +++++---------- docs/swagger/swagger.yaml | 23 +++--------- 4 files changed, 49 insertions(+), 68 deletions(-) diff --git a/app/module/articles/request/articles.request.go b/app/module/articles/request/articles.request.go index ff78b0a..7660392 100644 --- a/app/module/articles/request/articles.request.go +++ b/app/module/articles/request/articles.request.go @@ -53,20 +53,36 @@ type ArticlesUpdateRequest struct { CategoryId int `json:"categoryId" validate:"required"` TypeId int `json:"typeId" validate:"required"` Tags string `json:"tags" validate:"required"` + CreatedById *uint `json:"createdById"` StatusId *int `json:"statusId"` } func (req ArticlesUpdateRequest) ToEntity() *entity.Articles { - return &entity.Articles{ - Title: req.Title, - Slug: req.Slug, - Description: req.Description, - HtmlDescription: req.HtmlDescription, - CategoryId: req.CategoryId, - TypeId: req.TypeId, - Tags: req.Tags, - StatusId: req.StatusId, - UpdatedAt: time.Now(), + if req.CreatedById == nil { + return &entity.Articles{ + Title: req.Title, + Slug: req.Slug, + Description: req.Description, + HtmlDescription: req.HtmlDescription, + CategoryId: req.CategoryId, + TypeId: req.TypeId, + Tags: req.Tags, + StatusId: req.StatusId, + UpdatedAt: time.Now(), + } + } else { + return &entity.Articles{ + Title: req.Title, + Slug: req.Slug, + Description: req.Description, + HtmlDescription: req.HtmlDescription, + CategoryId: req.CategoryId, + TypeId: req.TypeId, + Tags: req.Tags, + StatusId: req.StatusId, + CreatedById: req.CreatedById, + UpdatedAt: time.Now(), + } } } diff --git a/docs/swagger/docs.go b/docs/swagger/docs.go index a43dfc3..2ad289c 100644 --- a/docs/swagger/docs.go +++ b/docs/swagger/docs.go @@ -5402,6 +5402,9 @@ const docTemplate = `{ "categoryId": { "type": "integer" }, + "createdById": { + "type": "integer" + }, "description": { "type": "string" }, @@ -5765,22 +5768,13 @@ const docTemplate = `{ "request.UsersCreateRequest": { "type": "object", "required": [ - "address", - "dateOfBirth", "email", "fullname", - "genderType", - "identityGroup", - "identityGroupNumber", - "identityNumber", - "identityType", - "lastEducation", "password", "phoneNumber", "userLevelId", "userRoleId", - "username", - "workType" + "username" ], "properties": { "address": { @@ -5836,21 +5830,13 @@ const docTemplate = `{ "request.UsersUpdateRequest": { "type": "object", "required": [ - "address", - "dateOfBirth", "email", "fullname", - "genderType", - "identityGroup", - "identityGroupNumber", - "identityNumber", - "identityType", - "lastEducation", + "password", "phoneNumber", "userLevelId", "userRoleId", - "username", - "workType" + "username" ], "properties": { "address": { @@ -5883,6 +5869,9 @@ const docTemplate = `{ "lastEducation": { "type": "string" }, + "password": { + "type": "string" + }, "phoneNumber": { "type": "string" }, diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json index e3b44d5..e2c7448 100644 --- a/docs/swagger/swagger.json +++ b/docs/swagger/swagger.json @@ -5391,6 +5391,9 @@ "categoryId": { "type": "integer" }, + "createdById": { + "type": "integer" + }, "description": { "type": "string" }, @@ -5754,22 +5757,13 @@ "request.UsersCreateRequest": { "type": "object", "required": [ - "address", - "dateOfBirth", "email", "fullname", - "genderType", - "identityGroup", - "identityGroupNumber", - "identityNumber", - "identityType", - "lastEducation", "password", "phoneNumber", "userLevelId", "userRoleId", - "username", - "workType" + "username" ], "properties": { "address": { @@ -5825,21 +5819,13 @@ "request.UsersUpdateRequest": { "type": "object", "required": [ - "address", - "dateOfBirth", "email", "fullname", - "genderType", - "identityGroup", - "identityGroupNumber", - "identityNumber", - "identityType", - "lastEducation", + "password", "phoneNumber", "userLevelId", "userRoleId", - "username", - "workType" + "username" ], "properties": { "address": { @@ -5872,6 +5858,9 @@ "lastEducation": { "type": "string" }, + "password": { + "type": "string" + }, "phoneNumber": { "type": "string" }, diff --git a/docs/swagger/swagger.yaml b/docs/swagger/swagger.yaml index 782d80b..3867aa1 100644 --- a/docs/swagger/swagger.yaml +++ b/docs/swagger/swagger.yaml @@ -119,6 +119,8 @@ definitions: properties: categoryId: type: integer + createdById: + type: integer description: type: string htmlDescription: @@ -413,22 +415,13 @@ definitions: workType: type: string required: - - address - - dateOfBirth - email - fullname - - genderType - - identityGroup - - identityGroupNumber - - identityNumber - - identityType - - lastEducation - password - phoneNumber - userLevelId - userRoleId - username - - workType type: object request.UsersUpdateRequest: properties: @@ -452,6 +445,8 @@ definitions: type: string lastEducation: type: string + password: + type: string phoneNumber: type: string statusId: @@ -465,21 +460,13 @@ definitions: workType: type: string required: - - address - - dateOfBirth - email - fullname - - genderType - - identityGroup - - identityGroupNumber - - identityNumber - - identityType - - lastEducation + - password - phoneNumber - userLevelId - userRoleId - username - - workType type: object response.BadRequestError: properties: