feat: update ppid data categories
This commit is contained in:
parent
bcefcdfaa5
commit
720359c955
|
|
@ -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 <Add access token here>)
|
||||
// @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)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -3622,6 +3622,12 @@
|
|||
],
|
||||
"summary": "Get all PpidDataCategories",
|
||||
"parameters": [
|
||||
{
|
||||
"type": "string",
|
||||
"description": "Insert your access token",
|
||||
"name": "Authorization",
|
||||
"in": "header"
|
||||
},
|
||||
{
|
||||
"type": "string",
|
||||
"name": "description",
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue