Enhance job and organization structure responses: add Existing field,…

… update DTOs, and preload organization structures
IlhamSetiaji · Dec 9, 2024 · c3bfae6 · c3bfae6
1 parent 52913f9
commit c3bfae6
Show file tree

Hide file tree

Showing 14 changed files with 108 additions and 42 deletions.
diff --git a/cmd/migration/main.go b/cmd/migration/main.go
@@ -174,22 +174,27 @@ func main() {
 		{
 			Name:                    "Kage",
 			OrganizationStructureID: createdStructures["Kage Department"].ID,
+			Existing:                30,
 		},
 		{
 			Name:                    "Jounin",
 			OrganizationStructureID: createdStructures["Jounin Department"].ID,
+			Existing:                30,
 		},
 		{
 			Name:                    "Chunin",
 			OrganizationStructureID: createdStructures["Chunin Department"].ID,
+			Existing:                30,
 		},
 		{
 			Name:                    "Genin",
 			OrganizationStructureID: createdStructures["Genin Department"].ID,
+			Existing:                30,
 		},
 		{
 			Name:                    "Academy",
 			OrganizationStructureID: createdStructures["Academy Department"].ID,
+			Existing:                30,
 		},
 	}
 

diff --git a/go-sso.exe~ b/go-sso.exe~
diff --git a/internal/entity/job.go b/internal/entity/job.go
@@ -17,6 +17,7 @@ type Job struct {
 	ParentID                *uuid.UUID            `json:"parent_id" gorm:"type:char(36)"`
 	Level                   int                   `json:"level" gorm:"index"`    // Add level for hierarchy depth
 	Path                    string                `json:"path" gorm:"type:text"` // Store full path for easy traversal
+	Existing                int                   `json:"existing" gorm:"default:0"`
 	OrganizationStructure   OrganizationStructure `json:"organization_structure" gorm:"foreignKey:OrganizationStructureID;references:ID;constraint:OnDelete:CASCADE"`
 	Parent                  *Job                  `json:"parent" gorm:"foreignKey:ParentID;references:ID;constraint:OnDelete:CASCADE"`
 	Children                []Job                 `json:"children" gorm:"foreignKey:ParentID;references:ID"`

diff --git a/internal/http/dto/job_dto.go b/internal/http/dto/job_dto.go
@@ -15,6 +15,7 @@ func ConvertToJobResponse(jobs *[]entity.Job) *[]response.JobResponse {
 			Level:                   job.Level,
 			ParentID:                job.ParentID,
 			Path:                    job.Path,
+			Existing:                job.Existing,
 			Children:                *ConvertToJobResponse(&job.Children),
 		})
 	}
@@ -29,6 +30,7 @@ func ConvertToSingleJobResponse(job *entity.Job) *response.JobResponse {
 		Level:                   job.Level,
 		ParentID:                job.ParentID,
 		Path:                    job.Path,
+		Existing:                job.Existing,
 		Children:                *ConvertToJobResponse(&job.Children),
 	}
 }
diff --git a/internal/http/dto/job_level_dto.go b/internal/http/dto/job_level_dto.go
@@ -0,0 +1,52 @@
+package dto
+
+import (
+	"app/go-sso/internal/entity"
+	"app/go-sso/internal/http/response"
+)
+
+func ConvertToJobLevelResponse(jobLevels *[]entity.JobLevel) *[]response.JobLevelResponse {
+	var responseJobLevels []response.JobLevelResponse
+	for _, jobLevel := range *jobLevels {
+		responseJobLevels = append(responseJobLevels, response.JobLevelResponse{
+			ID:    jobLevel.ID,
+			Name:  jobLevel.Name,
+			Level: jobLevel.Level,
+			OrganizationStructures: func() *[]response.OrganizationStructureMinimalResponse {
+				var responseOrganizationStructures []response.OrganizationStructureMinimalResponse
+				for _, organizationStructure := range jobLevel.OrganizationStructures {
+					responseOrganizationStructures = append(responseOrganizationStructures, response.OrganizationStructureMinimalResponse{
+						ID:             organizationStructure.ID,
+						Name:           organizationStructure.Name,
+						Level:          organizationStructure.Level,
+						OrganizationID: organizationStructure.OrganizationID,
+						Path:           organizationStructure.Path,
+					})
+				}
+				return &responseOrganizationStructures
+			}(),
+		})
+	}
+	return &responseJobLevels
+}
+
+func ConvertToSingleJobLevelResponse(jobLevel *entity.JobLevel) *response.JobLevelResponse {
+	return &response.JobLevelResponse{
+		ID:    jobLevel.ID,
+		Name:  jobLevel.Name,
+		Level: jobLevel.Level,
+		OrganizationStructures: func() *[]response.OrganizationStructureMinimalResponse {
+			var responseOrganizationStructures []response.OrganizationStructureMinimalResponse
+			for _, organizationStructure := range jobLevel.OrganizationStructures {
+				responseOrganizationStructures = append(responseOrganizationStructures, response.OrganizationStructureMinimalResponse{
+					ID:             organizationStructure.ID,
+					Name:           organizationStructure.Name,
+					Level:          organizationStructure.Level,
+					OrganizationID: organizationStructure.OrganizationID,
+					Path:           organizationStructure.Path,
+				})
+			}
+			return &responseOrganizationStructures
+		}(),
+	}
+}
diff --git a/internal/http/dto/organization_dto.go → ...al/http/dto/organization_structure_dto.go b/internal/http/dto/organization_dto.go → ...al/http/dto/organization_structure_dto.go
diff --git a/internal/http/response/job_level_response.go b/internal/http/response/job_level_response.go
@@ -3,7 +3,8 @@ package response
 import "github.com/google/uuid"
 
 type JobLevelResponse struct {
-	ID    uuid.UUID `json:"id"`
-	Name  string    `json:"name"`
-	Level string    `json:"level"`
+	ID                     uuid.UUID                               `json:"id"`
+	Name                   string                                  `json:"name"`
+	Level                  string                                  `json:"level"`
+	OrganizationStructures *[]OrganizationStructureMinimalResponse `json:"organization_structures"`
 }
diff --git a/internal/http/response/job_response.go b/internal/http/response/job_response.go
@@ -11,5 +11,6 @@ type JobResponse struct {
 	ParentID                *uuid.UUID    `json:"parent_id"`
 	Level                   int           `json:"level"` // Add level for hierarchy depth
 	Path                    string        `json:"path"`  // Store full path for easy traversal
+	Existing                int           `json:"existing"`
 	Children                []JobResponse `json:"children"`
 }
diff --git a/internal/http/response/ogranization_structure_response.go b/internal/http/response/ogranization_structure_response.go
@@ -15,3 +15,11 @@ type OrganizationStructureResponse struct {
 	Parent         *OrganizationStructureResponse  `json:"parent,omitempty"`
 	Children       []OrganizationStructureResponse `json:"children,omitempty"`
 }
+
+type OrganizationStructureMinimalResponse struct {
+	ID             uuid.UUID `json:"id"`
+	OrganizationID uuid.UUID `json:"organization_id"`
+	Name           string    `json:"name"`
+	Level          int       `json:"level"`
+	Path           string    `json:"path"`
+}
diff --git a/internal/repository/job_level_repository.go b/internal/repository/job_level_repository.go
@@ -30,7 +30,7 @@ func (r *JobLevelRepository) FindAllPaginated(page int, pageSize int, search str
 	var jobLevels []entity.JobLevel
 	var total int64
 
-	query := r.DB
+	query := r.DB.Preload("OrganizationStructures")
 
 	if search != "" {
 		query = query.Where("name LIKE ?", "%"+search+"%")
@@ -49,7 +49,7 @@ func (r *JobLevelRepository) FindAllPaginated(page int, pageSize int, search str
 
 func (r *JobLevelRepository) FindById(id uuid.UUID) (*entity.JobLevel, error) {
 	var jobLevel entity.JobLevel
-	err := r.DB.Where("id = ?", id).First(&jobLevel).Error
+	err := r.DB.Preload("OrganizationStructures").Where("id = ?", id).First(&jobLevel).Error
 	if err != nil {
 		return nil, err
 	}

diff --git a/internal/repository/job_repository.go b/internal/repository/job_repository.go
@@ -3,7 +3,6 @@ package repository
 import (
 	"app/go-sso/internal/config"
 	"app/go-sso/internal/entity"
-	"errors"
 
 	"github.com/google/uuid"
 	"github.com/sirupsen/logrus"
@@ -15,7 +14,6 @@ type IJobRepository interface {
 	FindById(id uuid.UUID) (*entity.Job, error)
 	GetJobsByOrganizationStructureIDs(organizationStructureIDs []uuid.UUID) (*[]entity.Job, error)
 	FindAllChildren(parentID uuid.UUID) ([]entity.Job, error)
-	FindParent(job entity.Job) (*entity.Job, error)
 }
 
 type JobRepository struct {
@@ -86,19 +84,6 @@ func (r *JobRepository) FindAllChildren(parentID uuid.UUID) ([]entity.Job, error
 	return children, nil
 }
 
-func (r *JobRepository) FindParent(job entity.Job) (*entity.Job, error) {
-	var parent entity.Job
-	err := r.DB.Where("id = ?", job.ParentID).First(&parent).Error
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, nil
-		} else {
-			return nil, errors.New("[JobRepository.FindParent] " + err.Error())
-		}
-	}
-	return &parent, nil
-}
-
 func JobRepositoryFactory(log *logrus.Logger) IJobRepository {
 	db := config.NewDatabase()
 	return NewJobRepository(log, db)

diff --git a/internal/usecase/job/get_jobs_by_job_level_id_usecase.go b/internal/usecase/job/get_jobs_by_job_level_id_usecase.go
@@ -1,7 +1,8 @@
 package usecase
 
 import (
-	"app/go-sso/internal/entity"
+	"app/go-sso/internal/http/dto"
+	"app/go-sso/internal/http/response"
 	"app/go-sso/internal/repository"
 
 	"github.com/google/uuid"
@@ -13,7 +14,7 @@ type IGetJobsByJobLevelIDUseCaseRequest struct {
 }
 
 type IGetJobsByJobLevelIDUseCaseResponse struct {
-	Jobs *[]entity.Job `json:"jobs"`
+	Jobs *[]response.JobResponse `json:"jobs"`
 }
 
 type IGetJobsByJobLevelIDUseCase interface {
@@ -56,8 +57,16 @@ func (uc *GetJobsByJobLevelIDUseCase) Execute(request *IGetJobsByJobLevelIDUseCa
 		return nil, err
 	}
 
+	for i, job := range *jobs {
+		children, err := uc.JobRepository.FindAllChildren(job.ID)
+		if err != nil {
+			return nil, err
+		}
+		(*jobs)[i].Children = children
+	}
+
 	return &IGetJobsByJobLevelIDUseCaseResponse{
-		Jobs: jobs,
+		Jobs: dto.ConvertToJobResponse(jobs),
 	}, nil
 }
 

diff --git a/internal/usecase/job_level/find_all_paginated_usecase.go b/internal/usecase/job_level/find_all_paginated_usecase.go
@@ -1,7 +1,8 @@
 package usecase
 
 import (
-	"app/go-sso/internal/entity"
+	"app/go-sso/internal/http/dto"
+	"app/go-sso/internal/http/response"
 	"app/go-sso/internal/repository"
 
 	"github.com/sirupsen/logrus"
@@ -14,42 +15,42 @@ type IFindAllPaginatedUseCaseRequest struct {
 }
 
 type IFindAllPaginatedUseCaseResponse struct {
-	Jobs  *[]entity.Job `json:"jobs"`
-	Total int64         `json:"total"`
+	JobLevels *[]response.JobLevelResponse `json:"job_levels"`
+	Total     int64                        `json:"total"`
 }
 
 type IFindAllPaginatedUseCase interface {
 	Execute(request *IFindAllPaginatedUseCaseRequest) (*IFindAllPaginatedUseCaseResponse, error)
 }
 
 type FindAllPaginatedUseCase struct {
-	Log           *logrus.Logger
-	JobRepository repository.IJobRepository
+	Log                *logrus.Logger
+	JobLevelRepository repository.IJobLevelRepository
 }
 
 func NewFindAllPaginatedUseCase(
 	log *logrus.Logger,
-	jobRepository repository.IJobRepository,
+	jobLevelRepository repository.IJobLevelRepository,
 ) IFindAllPaginatedUseCase {
 	return &FindAllPaginatedUseCase{
-		Log:           log,
-		JobRepository: jobRepository,
+		Log:                log,
+		JobLevelRepository: jobLevelRepository,
 	}
 }
 
 func (uc *FindAllPaginatedUseCase) Execute(req *IFindAllPaginatedUseCaseRequest) (*IFindAllPaginatedUseCaseResponse, error) {
-	jobs, total, err := uc.JobRepository.FindAllPaginated(req.Page, req.PageSize, req.Search)
+	jobs, total, err := uc.JobLevelRepository.FindAllPaginated(req.Page, req.PageSize, req.Search)
 	if err != nil {
 		return nil, err
 	}
 
 	return &IFindAllPaginatedUseCaseResponse{
-		Jobs:  jobs,
-		Total: total,
+		JobLevels: dto.ConvertToJobLevelResponse(jobs),
+		Total:     total,
 	}, nil
 }
 
 func FindAllPaginatedUseCaseFactory(log *logrus.Logger) IFindAllPaginatedUseCase {
-	jobRepository := repository.JobRepositoryFactory(log)
-	return NewFindAllPaginatedUseCase(log, jobRepository)
+	jobLevelRepository := repository.JobLevelRepositoryFactory(log)
+	return NewFindAllPaginatedUseCase(log, jobLevelRepository)
 }
diff --git a/internal/usecase/job_level/find_by_id_usecase.go b/internal/usecase/job_level/find_by_id_usecase.go
@@ -1,7 +1,8 @@
 package usecase
 
 import (
-	"app/go-sso/internal/entity"
+	"app/go-sso/internal/http/dto"
+	"app/go-sso/internal/http/response"
 	"app/go-sso/internal/repository"
 
 	"github.com/google/uuid"
@@ -13,7 +14,7 @@ type IFindByIdUseCaseRequest struct {
 }
 
 type IFindByIdUseCaseResponse struct {
-	Job *entity.Job `json:"job"`
+	Job *response.JobLevelResponse `json:"job"`
 }
 
 type IFindByIdUseCase interface {
@@ -22,12 +23,12 @@ type IFindByIdUseCase interface {
 
 type FindByIdUseCase struct {
 	Log           *logrus.Logger
-	JobRepository repository.IJobRepository
+	JobRepository repository.IJobLevelRepository
 }
 
 func NewFindByIdUseCase(
 	log *logrus.Logger,
-	jobRepository repository.IJobRepository,
+	jobRepository repository.IJobLevelRepository,
 ) IFindByIdUseCase {
 	return &FindByIdUseCase{
 		Log:           log,
@@ -42,11 +43,11 @@ func (uc *FindByIdUseCase) Execute(req *IFindByIdUseCaseRequest) (*IFindByIdUseC
 	}
 
 	return &IFindByIdUseCaseResponse{
-		Job: job,
+		Job: dto.ConvertToSingleJobLevelResponse(job),
 	}, nil
 }
 
 func FindByIdUseCaseFactory(log *logrus.Logger) IFindByIdUseCase {
-	jobRepository := repository.JobRepositoryFactory(log)
+	jobRepository := repository.JobLevelRepositoryFactory(log)
 	return NewFindByIdUseCase(log, jobRepository)
 }