diff --git a/app/module/ppid_data_categories/mapper/ppid_data_categories.mapper.go b/app/module/ppid_data_categories/mapper/ppid_data_categories.mapper.go index 0b6b6b7..f346caa 100644 --- a/app/module/ppid_data_categories/mapper/ppid_data_categories.mapper.go +++ b/app/module/ppid_data_categories/mapper/ppid_data_categories.mapper.go @@ -9,8 +9,10 @@ import ( func PpidDataCategoriesResponseMapper(ppidDataCategoriesReq *entity.PpidDataCategories, childPpidDataCategoriesReq []*entity.PpidDataCategories) (ppidDataCategoriesRes *res.PpidDataCategoriesResponse) { if ppidDataCategoriesReq != nil { var childPpidDataCategoriesRes []*res.PpidDataCategoriesResponse - for _, item := range childPpidDataCategoriesReq { - childPpidDataCategoriesRes = append(childPpidDataCategoriesRes, PpidDataCategoriesResponseMapper(item, nil)) + if childPpidDataCategoriesReq != nil && len(childPpidDataCategoriesReq) > 0 { + for _, item := range childPpidDataCategoriesReq { + childPpidDataCategoriesRes = append(childPpidDataCategoriesRes, PpidDataCategoriesResponseMapper(item, nil)) + } } ppidDataCategoriesRes = &res.PpidDataCategoriesResponse{ diff --git a/app/module/ppid_data_categories/repository/ppid_data_categories.repository.go b/app/module/ppid_data_categories/repository/ppid_data_categories.repository.go index 9b83068..1665196 100644 --- a/app/module/ppid_data_categories/repository/ppid_data_categories.repository.go +++ b/app/module/ppid_data_categories/repository/ppid_data_categories.repository.go @@ -39,7 +39,7 @@ func (_i *ppidDataCategoriesRepository) GetAll(req request.PpidDataCategoriesQue var count int64 _i.Log.Info().Str("timestamp", time.Now(). - Format(time.RFC3339)).Str("Service:GetAll", "Interface:ppidDataCategoriesRepository"). + Format(time.RFC3339)).Str("Service:GetAlls", "Interface:ppidDataCategoriesRepository"). Interface("req", req).Msg("") query := _i.DB.DB.Model(&entity.PpidDataCategories{}) @@ -134,6 +134,10 @@ func (_i *ppidDataCategoriesRepository) FindOneBySlug(slug string) (ppidDataCate return nil, err } + _i.Log.Info().Str("timestamp", time.Now(). + Format(time.RFC3339)).Str("Service:FindOneBySlug", "Interface:FindOneBySlug"). + Interface("ppidDataCategories", ppidDataCategories).Msg("") + return ppidDataCategories, nil } 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 81b8e02..d0c92f6 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 @@ -93,7 +93,10 @@ func (_i *ppidDataCategoriesService) ShowBySlug(slug string) (ppidDataCategories } req := request.PpidDataCategoriesQueryRequest{ - ParentId: result.ParentId, + ParentId: &result.ID, + Pagination: &paginator.Pagination{ + Limit: 20, + }, } subResult, _, _ := _i.Repo.GetAll(req)