From 720359c9553c4c8494a93827e235256a6d617a92 Mon Sep 17 00:00:00 2001 From: hanif salafi Date: Wed, 2 Oct 2024 01:08:38 +0700 Subject: [PATCH] feat: update ppid data categories --- .../ppid_data_categories.controller.go | 7 ++++-- .../service/ppid_data_categories.service.go | 22 ++++++++++++++----- docs/swagger/docs.go | 6 +++++ docs/swagger/swagger.json | 6 +++++ docs/swagger/swagger.yaml | 4 ++++ 5 files changed, 37 insertions(+), 8 deletions(-) diff --git a/app/module/ppid_data_categories/controller/ppid_data_categories.controller.go b/app/module/ppid_data_categories/controller/ppid_data_categories.controller.go index 4db04dd..60dc628 100644 --- a/app/module/ppid_data_categories/controller/ppid_data_categories.controller.go +++ b/app/module/ppid_data_categories/controller/ppid_data_categories.controller.go @@ -43,6 +43,7 @@ func NewPpidDataCategoriesController(ppidDataCategoriesService service.PpidDataC // @Description API for getting all PpidDataCategories // @Tags PPID Categories // @Security Bearer +// @Param Authorization header string false "Insert your access token" default (Bearer ) // @Param req query request.PpidDataCategoriesQueryRequest false "query parameters" // @Param req query paginator.Pagination false "pagination parameters" // @Success 200 {object} response.Response @@ -66,9 +67,11 @@ func (_i *ppidDataCategoriesController) All(c *fiber.Ctx) error { } req := reqContext.ToParamRequest() + authToken := c.Get("Authorization") + _i.Log.Info().Str("timestamp", time.Now(). Format(time.RFC3339)).Str("Service:All", "ppidDataCategoriesController"). - Interface("req", req).Msg("") + Interface("authToken", authToken).Msg("") req.Pagination = paginate var ppidDataCategoriesData []*response.PpidDataCategoriesResponse @@ -77,7 +80,7 @@ func (_i *ppidDataCategoriesController) All(c *fiber.Ctx) error { isPpidDataIncluded := req.IsPpidDataIncluded if isPpidDataIncluded != nil && *isPpidDataIncluded == true { - ppidDataCategoriesWithPpidDataResponse, paging, err = _i.ppidDataCategoriesService.AllInPpidData(req) + ppidDataCategoriesWithPpidDataResponse, paging, err = _i.ppidDataCategoriesService.AllInPpidData(req, authToken) } else { ppidDataCategoriesData, paging, err = _i.ppidDataCategoriesService.All(req) } diff --git a/app/module/ppid_data_categories/service/ppid_data_categories.service.go b/app/module/ppid_data_categories/service/ppid_data_categories.service.go index eeab158..de87f5a 100644 --- a/app/module/ppid_data_categories/service/ppid_data_categories.service.go +++ b/app/module/ppid_data_categories/service/ppid_data_categories.service.go @@ -42,7 +42,7 @@ type ppidDataCategoriesService struct { // PpidDataCategoriesService define interface of IPpidDataCategoriesService type PpidDataCategoriesService interface { All(req request.PpidDataCategoriesQueryRequest) (ppidDataCategories []*response.PpidDataCategoriesResponse, paging paginator.Pagination, err error) - AllInPpidData(req request.PpidDataCategoriesQueryRequest) (ppidDataCategories []*response.PpidDataCategoriesWithPpidDataResponse, paging paginator.Pagination, err error) + AllInPpidData(req request.PpidDataCategoriesQueryRequest, authToken string) (ppidDataCategories []*response.PpidDataCategoriesWithPpidDataResponse, paging paginator.Pagination, err error) Show(id uint) (ppidDataCategories *response.PpidDataCategoriesResponse, err error) ShowBySlug(slug string) (ppidDataCategories *response.PpidDataCategoriesResponse, err error) Save(req request.PpidDataCategoriesCreateRequest, authToken string) (err error) @@ -95,12 +95,22 @@ func (_i *ppidDataCategoriesService) All(req request.PpidDataCategoriesQueryRequ return } -func (_i *ppidDataCategoriesService) AllInPpidData(req request.PpidDataCategoriesQueryRequest) (ppidDataCategories []*response.PpidDataCategoriesWithPpidDataResponse, paging paginator.Pagination, err error) { - findLevel, err := _i.UserLevelsRepo.FindOneByAlias(*req.LevelGroup) - if err != nil { - return +func (_i *ppidDataCategoriesService) AllInPpidData(req request.PpidDataCategoriesQueryRequest, authToken string) (ppidDataCategories []*response.PpidDataCategoriesWithPpidDataResponse, paging paginator.Pagination, err error) { + + if req.LevelGroup != nil { + findLevel, err := _i.UserLevelsRepo.FindOneByAlias(*req.LevelGroup) + if err != nil { + return ppidDataCategories, paging, err + } + if findLevel != nil { + req.LevelGroupId = &findLevel.ID + } + } + + createdBy := utilSvc.GetUserInfo(_i.Log, _i.UsersRepo, authToken) + if createdBy != nil { + req.LevelGroupId = &createdBy.UserLevelId } - req.LevelGroupId = &findLevel.ID results, paging, err := _i.Repo.GetAll(req) if err != nil { diff --git a/docs/swagger/docs.go b/docs/swagger/docs.go index 02016ae..6b551b9 100644 --- a/docs/swagger/docs.go +++ b/docs/swagger/docs.go @@ -3633,6 +3633,12 @@ const docTemplate = `{ ], "summary": "Get all PpidDataCategories", "parameters": [ + { + "type": "string", + "description": "Insert your access token", + "name": "Authorization", + "in": "header" + }, { "type": "string", "name": "description", diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json index 0c3a495..81dff52 100644 --- a/docs/swagger/swagger.json +++ b/docs/swagger/swagger.json @@ -3622,6 +3622,12 @@ ], "summary": "Get all PpidDataCategories", "parameters": [ + { + "type": "string", + "description": "Insert your access token", + "name": "Authorization", + "in": "header" + }, { "type": "string", "name": "description", diff --git a/docs/swagger/swagger.yaml b/docs/swagger/swagger.yaml index 018a528..33c1d9e 100644 --- a/docs/swagger/swagger.yaml +++ b/docs/swagger/swagger.yaml @@ -3160,6 +3160,10 @@ paths: get: description: API for getting all PpidDataCategories parameters: + - description: Insert your access token + in: header + name: Authorization + type: string - in: query name: description type: string