diff --git a/src/cmd/__debug_bin1448138251 b/src/cmd/__debug_bin1448138251 new file mode 100755 index 0000000000000000000000000000000000000000..19e0187a543f4836ab706a97b3f2976d506548c1 Binary files /dev/null and b/src/cmd/__debug_bin1448138251 differ diff --git a/src/handler/handler.go b/src/handler/handler.go index 82755d022610651378870dd592c511767b65558b..ff343af1d4b27194d89ceeaa32410cf6a240fc02 100644 --- a/src/handler/handler.go +++ b/src/handler/handler.go @@ -45,6 +45,7 @@ type Service struct { DosbingBimbinganLogHandler *bimbinganLogTransport.DosbingimbinganLogHandler TIMTASchedulingHandler *schedulingTransport.TIMTASchedulingHandler MahasiswaPendaftaranSidSemHandler *pendaftaranSidSemTransport.MahasiswaPendaftaranSidSemHandler + TIMTAPendaftaranSidSemHandler *pendaftaranSidSemTransport.TIMTAPendaftaranSidSemHandler } func MakeHandler() *Service { @@ -104,6 +105,11 @@ func MakeHandler() *Service { DBWrite: dbWrite, }) + TIMTAPendaftaranSidSemHandler := pendaftaranSidSemTransport.NewTIMTAPendaftaranSidSemHandler(pendaftaranSidSemConfig.PendaftaranSidSemTransportConfig{ + DBRead: dbRead, + DBWrite: dbWrite, + }) + DosbingBimbinganLogHandler := bimbinganLogTransport.NewDosbingBimginganLogHandler(bimbinganLogConfig.BimbinganLogTransportConfig{ DBWrite: dbWrite, DBRead: dbRead, @@ -136,5 +142,6 @@ func MakeHandler() *Service { AdminDashboardTimTugasHandler: AdminDashboardTimTugasHandler, TIMTASchedulingHandler: TIMTASchedulingHandlerHandler, MahasiswaPendaftaranSidSemHandler: MahasiswaPendaftaranSidSemHandler, + TIMTAPendaftaranSidSemHandler: TIMTAPendaftaranSidSemHandler, } } diff --git a/src/handler/server.go b/src/handler/server.go index ed38729f1c886cbaf2d7e0b57103be2017579eca..77dd799bc54218011550cddf9d7f20e605b2ff01 100644 --- a/src/handler/server.go +++ b/src/handler/server.go @@ -61,6 +61,7 @@ func (s *Service) InitializeRoutes() *echo.Echo { TIMTAGroup := e.Group("api/TIMTA") TIMTAGroup.Use(middleware.Validator("TIM_TA")) s.TIMTASchedulingHandler.MountTIMTA(TIMTAGroup) + s.TIMTAPendaftaranSidSemHandler.MountTIMTA(TIMTAGroup) return e } diff --git a/src/module/pendaftaran_sidsem/internal/repository/pendaftaran_sidsem.go b/src/module/pendaftaran_sidsem/internal/repository/pendaftaran_sidsem.go index ba10eb2dc4969ccca0e2b17fe324a4b7dc915e1d..b9dcb561a8d422b3b884f5248f9f279d682ad5ac 100644 --- a/src/module/pendaftaran_sidsem/internal/repository/pendaftaran_sidsem.go +++ b/src/module/pendaftaran_sidsem/internal/repository/pendaftaran_sidsem.go @@ -97,6 +97,9 @@ func (repo *PendaftaranSidSemRepo) GetPendaftaran(offset, size int) (output []en var dataJadwal []entity.PendaftaranSidSemRequest result := repo.DBRead.Limit(size).Offset(offset).Find(&pendaftaransidsem) + for _, jadwal := range pendaftaransidsem { + print(jadwal.ID) + } for _, jadwal := range pendaftaransidsem { res := repo.DBRead.Where("id = ?", jadwal.PendaftaranTAID).Limit(1).Find(&pendaftaranTA) if res.Error != nil { @@ -121,7 +124,6 @@ func (repo *PendaftaranSidSemRepo) GetPendaftaran(offset, size int) (output []en dataJadwal = append(dataJadwal, data) } - if result.Error != nil { return nil, err } diff --git a/src/module/pendaftaran_sidsem/transport/admin_handler.go b/src/module/pendaftaran_sidsem/transport/admin_handler.go index e666bea46b56cd16778e846c9298bb79826d05e5..4e8c9067e936177d694d4c4b3b24e9aa71021b1f 100644 --- a/src/module/pendaftaran_sidsem/transport/admin_handler.go +++ b/src/module/pendaftaran_sidsem/transport/admin_handler.go @@ -28,7 +28,6 @@ func NewAdminJadwalSeminarHandler(cfg config.PendaftaranSidSemTransportConfig) * func (t *AdminPendaftaranSidSemHandler) MountAdmin(group *echo.Group) { group.GET("/pendaftaran-sidsem-periode", t.GetPendaftaranByPeriode) - group.GET("/pendaftaran-sidsem", t.GetPendaftaran) group.DELETE("/pendaftaran-sidsem", t.DeletePendaftaran) group.GET("/pendaftaran-sidang", t.GetPendaftaranSidangById) group.GET("/pendaftaran-seminar", t.GetPendaftaranSeminarById) @@ -40,26 +39,6 @@ func (t *AdminPendaftaranSidSemHandler) MountAdmin(group *echo.Group) { group.PATCH("/pendaftaran-ditolak", t.EditDitolak) } -func (t *AdminPendaftaranSidSemHandler) GetPendaftaran(c echo.Context) error { - sizeStr := c.QueryParam("limit") - offsetStr := c.QueryParam("offset") - - size, err := strconv.Atoi(sizeStr) - if err != nil { - size = 10 - } - offset, err := strconv.Atoi(offsetStr) - if err != nil { - offset = 0 - } - jadwal, err := t.pendaftaransidsemUsecase.GetPendaftaran(size, offset) - if err != nil { - return c.JSON(http.StatusBadRequest, utils.ResponseDetailOutput(false, http.StatusBadRequest, err.Error(), nil)) - } - - return c.JSON(http.StatusOK, utils.ResponseDetailOutput(true, http.StatusOK, "Pendaftaran successfully retreived", jadwal)) -} - func (t *AdminPendaftaranSidSemHandler) GetPendaftaranByPeriode(c echo.Context) error { idPeriode := c.QueryParam("id_periode") sizeStr := c.QueryParam("limit") diff --git a/src/module/pendaftaran_sidsem/transport/timta_handler.go b/src/module/pendaftaran_sidsem/transport/timta_handler.go new file mode 100644 index 0000000000000000000000000000000000000000..ce08ff7db6bf12b756ea668eb5df8ea128d56bf5 --- /dev/null +++ b/src/module/pendaftaran_sidsem/transport/timta_handler.go @@ -0,0 +1,51 @@ +package transport + +import ( + "net/http" + "strconv" + + "github.com/labstack/echo/v4" + "gitlab.informatika.org/k-01-11/graduit-be/src/module/pendaftaran_sidsem/config" + "gitlab.informatika.org/k-01-11/graduit-be/src/module/pendaftaran_sidsem/internal/repository" + "gitlab.informatika.org/k-01-11/graduit-be/src/module/pendaftaran_sidsem/internal/usecase" + "gitlab.informatika.org/k-01-11/graduit-be/src/utils" +) + +type TIMTAPendaftaranSidSemHandler struct { + pendaftaransidsemUsecase usecase.PendaftaranSidSemUsecase +} + +func NewTIMTAPendaftaranSidSemHandler(cfg config.PendaftaranSidSemTransportConfig) *TIMTAPendaftaranSidSemHandler { + pendaftaransidsemRepository := repository.NewPendaftaranSidSemRepository(cfg.DBWrite, cfg.DBRead) + pendaftaransidsemUsecase := usecase.NewPendaftaranSidSemUseCase(pendaftaransidsemRepository) + + return &TIMTAPendaftaranSidSemHandler{ + pendaftaransidsemUsecase: pendaftaransidsemUsecase, + } + +} + +func (t *TIMTAPendaftaranSidSemHandler) MountTIMTA(group *echo.Group) { + group.GET("/pendaftaran-sidsem", t.GetPendaftaran) +} + +func (t *TIMTAPendaftaranSidSemHandler) GetPendaftaran(c echo.Context) error { + sizeStr := c.QueryParam("limit") + offsetStr := c.QueryParam("offset") + + size, err := strconv.Atoi(sizeStr) + if err != nil { + size = 10 + } + offset, err := strconv.Atoi(offsetStr) + if err != nil { + offset = 0 + } + jadwal, err := t.pendaftaransidsemUsecase.GetPendaftaran(size, offset) + if err != nil { + return c.JSON(http.StatusBadRequest, utils.ResponseDetailOutput(false, http.StatusBadRequest, err.Error(), nil)) + } + + return c.JSON(http.StatusOK, utils.ResponseDetailOutput(true, http.StatusOK, "Pendaftaran successfully retreived", jadwal)) +} +