diff --git a/src/module/pendaftaran_sidsem/entity/pendaftaran_sidsem.go b/src/module/pendaftaran_sidsem/entity/pendaftaran_sidsem.go index b5d63ab9358854f1f1fc15eca0584e5093a3ba48..5aac01a5ce15609d4a6b4425a2058788614c4deb 100644 --- a/src/module/pendaftaran_sidsem/entity/pendaftaran_sidsem.go +++ b/src/module/pendaftaran_sidsem/entity/pendaftaran_sidsem.go @@ -210,7 +210,7 @@ type DetailSidSemTA struct { Email string `json:"email"` JalurPilihan string `json:"jalur_pilihan"` DosbingName string `json:"dosbing_name"` - DosujiName string `json:"dosuji_name"` + DosujiName []string `json:"dosuji_name"` Tipe string `json:"tipe"` JudulProposal string `json:"judul_proposal"` Deskripsi string `json:"deskripsi"` diff --git a/src/module/pendaftaran_sidsem/internal/repository/pendaftaran_sidsem.go b/src/module/pendaftaran_sidsem/internal/repository/pendaftaran_sidsem.go index a1462a2303456676ed08a5b37dcc822adf56e797..8390dea88909da674affd51f741fa69b2133deae 100644 --- a/src/module/pendaftaran_sidsem/internal/repository/pendaftaran_sidsem.go +++ b/src/module/pendaftaran_sidsem/internal/repository/pendaftaran_sidsem.go @@ -550,13 +550,13 @@ func (repo *PendaftaranSidSemRepo) GetRemainingDetailSidSem(idPendaftaranSidSem return remDet, nil } -func (repo *PendaftaranSidSemRepo) GetDosujiNamePlaceholder(idSidsem string) (entity.DosbingName, error) { - var dosbingName entity.DosbingName +func (repo *PendaftaranSidSemRepo) GetDosujiNamePlaceholder(idSidsem string) ([]entity.DosbingName, error) { + var dosbingName []entity.DosbingName query := ` SELECT p.nama FROM pengguna p JOIN penguji_sidsem ps ON p.id = ps.dosen_id JOIN pendaftaran_sidsem pd ON pd.id = ps.sidsem_id WHERE pd.id = ?` if err := repo.DBRead.Raw(query, idSidsem).Scan(&dosbingName).Error; err != nil { - return entity.DosbingName{}, err + return []entity.DosbingName{}, err } return dosbingName, nil diff --git a/src/module/pendaftaran_sidsem/internal/usecase/pendaftaran_sidsem.go b/src/module/pendaftaran_sidsem/internal/usecase/pendaftaran_sidsem.go index 5cbeb7efc35cf0442574042675af0139dfde8625..4beb95d6bfc04e122667552a39063cce66f0788c 100644 --- a/src/module/pendaftaran_sidsem/internal/usecase/pendaftaran_sidsem.go +++ b/src/module/pendaftaran_sidsem/internal/usecase/pendaftaran_sidsem.go @@ -214,11 +214,16 @@ func (uc *PendaftaranSidSemUc) GetSidSemDetailTA(idSidsem string) (entity.Detail return entity.DetailSidSemTA{}, err } - dosujiName, err := uc.pendaftaransidsemrepo.GetDosujiNamePlaceholder(idSidsem) + dosujiNames, err := uc.pendaftaransidsemrepo.GetDosujiNamePlaceholder(idSidsem) if err != nil { return entity.DetailSidSemTA{}, err } + var dosujiNameList []string + for _, dosujiName := range dosujiNames { + dosujiNameList = append(dosujiNameList, dosujiName.Nama) + } + judDes, err := uc.pendaftaransidsemrepo.GetSidSemJudDes(idSidsem) if err != nil { return entity.DetailSidSemTA{}, err @@ -242,14 +247,13 @@ func (uc *PendaftaranSidSemUc) GetSidSemDetailTA(idSidsem string) (entity.Detail return entity.DetailSidSemTA{}, err } } - detailSidsemTA := entity.DetailSidSemTA{ IDMahasiswa: infoTopik.IDMahasiswa, Nama: infoTopik.Nama, Email: infoTopik.Email, JalurPilihan: infoTopik.JalurPilihan, DosbingName: dosbingName.Nama, - DosujiName: dosujiName.Nama, + DosujiName: dosujiNameList, Tipe: remDet.Tipe, JudulProposal: judDes.JudulProposal, Deskripsi: judDes.Deskripsi, diff --git a/src/module/pendaftaran_sidsem/internal/usecase/repository.go b/src/module/pendaftaran_sidsem/internal/usecase/repository.go index e0e6d574637a9f67a731cddd09a8abd0b3eb9383..f649d16563dd19aceb298e0b0afe97a94e0ca9ba 100644 --- a/src/module/pendaftaran_sidsem/internal/usecase/repository.go +++ b/src/module/pendaftaran_sidsem/internal/usecase/repository.go @@ -24,7 +24,7 @@ type PendaftaranSidSemRepository interface { IsRegisteredSidsem(idMahasiswa string, tipe string) (string, error) GetInfoTopikMahasiswa(idMahasiswa string) (entity.InfoTopikMahasiswa, error) GetRemainingDetailSidSem(idMahasiswa string) (entity.RemainingDetailSidSem, error) - GetDosujiNamePlaceholder(idSidsem string) (entity.DosbingName, error) + GetDosujiNamePlaceholder(idSidsem string) ([]entity.DosbingName, error) GetSidSemJudDes(idSidsem string) (entity.TipeJudulDesc, error) GetSidSemBerkas(idSidsem string) ([]entity.BerkasSidSem, error) GetRuanganName(idSidsem string) (string, error)