Merge pull request #27 from hammercode-dev/BE-15/add-endpoint-get-admin-events

Be 15/add endpoint get admin events

Author: AfandyW

app/events/usecase/get_event_general.go

@@ -18,5 +18,6 @@ func (uc usecase) GetEventByID(ctx context.Context, id uint) (resp domain.EventD
 	baseURL := config.GetConfig().BaseURL
 
 	event.Image = fmt.Sprintf("%s/api/v1/public/storage/images/%s", baseURL, event.Image)
-	return resp, err
+	
+	return event.ToDTO(), err
 }

app/events/usecase/update_event.go

@@ -36,6 +36,7 @@ func (uc usecase) UpdateEvent(ctx context.Context, id uint, payload domain.Updat
 		Price:                payload.Price,
 		ReservationStartDate: payload.ReservationStartDate,
 		ReservationEndDate:   payload.ReservationEndDate,
+		SessionType:          payload.SessionType,
 		UpdatedAt:            null.TimeFrom(time.Now()),
 	})
 	if err != nil {

app/users/repository/find_users.go

@@ -17,7 +17,7 @@ func (repo *repository) FindByEmail(ctx context.Context, email string) (user dom
 }
 
 func (repo *repository) FindById(ctx context.Context, id int8) (user domain.User, err error) {
-	err = repo.db.DB(ctx).Select("id", "username", "email", "role", "fullname", "date_of_birth", "gender", "phone_number", "address", "github", "linkedin", "personal_web").Where("id = ?", id).Take(&user).Error
+	err = repo.db.DB(ctx).Select("id", "username", "email", "role", "fullname", "date_of_birth", "gender", "phone_number", "address", "github_url", "linkedin_url", "personal_web_url").Where("id = ?", id).Take(&user).Error
 	if err != nil {
 		logrus.Error("repo.FindById: failed to find user")
 		return

cmd/serve_http.go

@@ -170,7 +170,8 @@ func registerHandler(app app.App) *mux.Router {
 	protectedV1Route.HandleFunc("/update", app.UserHandler.UpdateProfileUser).Methods(http.MethodPut)
 	protectedV1Route.HandleFunc("/delete", app.UserHandler.DeleteUser).Methods(http.MethodDelete)
 
-	protectedV1Route.HandleFunc("/events", app.EventHandler.CreateEvent).Methods(http.MethodPost)
+	// protectedV1Route.HandleFunc("/events", app.EventHandler.CreateEvent).Methods(http.MethodPost)
+	protectedV1Route.HandleFunc("/events", app.EventHandler.GetEvents).Methods(http.MethodGet)
 	protectedV1Route.HandleFunc("/events/registrations", app.EventHandler.RegisterEvent).Methods(http.MethodPost)
 	protectedV1Route.HandleFunc("/events/registrations", app.EventHandler.ListRegistration).Methods(http.MethodGet)
 	protectedV1Route.HandleFunc("/events/pays", app.EventHandler.ListEventPay).Methods(http.MethodGet)
@@ -188,11 +189,12 @@ func registerHandler(app app.App) *mux.Router {
 	protectedV1Route.HandleFunc("/blogs/{id}", app.BlogPostHandler.UpdateBlogPost).Methods(http.MethodPatch)
 	protectedV1Route.HandleFunc("/blogs/{id}", app.BlogPostHandler.DeleteBlogPost).Methods(http.MethodDelete)
 
-	protectedV1AdminRoute.HandleFunc("/events", app.EventHandler.CreateEvent).Methods(http.MethodPost)
-	protectedV1Route.HandleFunc("/events", app.EventHandler.GetEvents).Methods(http.MethodGet)
+	// Admin Route
+	protectedV1AdminRoute.HandleFunc("/events", app.EventHandler.GetEvents).Methods(http.MethodGet)
+	protectedV1AdminRoute.HandleFunc("/events/{id}", app.EventHandler.UpdateEvent).Methods(http.MethodPut)
 	protectedV1AdminRoute.HandleFunc("/events/{id}", app.EventHandler.DeleteEvent).Methods(http.MethodDelete)
+	protectedV1AdminRoute.HandleFunc("/events", app.EventHandler.CreateEvent).Methods(http.MethodPost)
 	protectedV1AdminRoute.HandleFunc("/events/{id}", app.EventHandler.GetDetail).Methods(http.MethodGet)
-
 	protectedV1AdminRoute.HandleFunc("/users", app.UserHandler.GetUsers).Methods(http.MethodGet)
 
 	return router

domain/event.go

@@ -58,6 +58,7 @@ type EventHandler interface {
 	ListRegistration(w http.ResponseWriter, r *http.Request)
 	ListEventPay(w http.ResponseWriter, r *http.Request)
 	PayProcess(w http.ResponseWriter, r *http.Request)
+	UpdateEvent(w http.ResponseWriter, r *http.Request)
 }
 
 type Event struct {
@@ -87,6 +88,7 @@ type Event struct {
 	UpdatedAt            null.Time           `json:"-"`
 	DeletedAt            null.Time           `json:"-"`
 	AdditionalLink       string              `json:"additional_link"`
+	SessionType          string              `json:"session_type"`
 }
 
 func (Event) TableName() string {
@@ -133,6 +135,7 @@ type CreateEventPayload struct {
 	ReservationStartDate null.Time           `json:"reservation_start_date"`
 	ReservationEndDate   null.Time           `json:"reservation_end_date"`
 	AdditionalLink       string              `json:"additional_link"`
+	SessionType          string              `json:"session_type"`
 }
 
 type UpdateEventPayload struct {
@@ -155,6 +158,7 @@ type UpdateEventPayload struct {
 	ReservationStartDate null.Time           `json:"reservation_start_date"`
 	ReservationEndDate   null.Time           `json:"reseveration_end_date"`
 	AdditionalLink       string              `json:"additional_link"`
+	SessionType          string              `json:"session_type"`
 }
 
 type EventDTO struct {
@@ -165,10 +169,12 @@ type EventDTO struct {
 	ImageEvent       string              `json:"image_event"`
 	DateEvent        null.Time           `json:"date_event"`
 	Type             constants.EventType `json:"type"`
+	Price            float64             `json:"price"`
 	Location         string              `json:"location"`
 	Duration         string              `json:"duration"`
 	Capacity         int                 `json:"capacity"`
 	RegistrationLink string              `json:"registration_link"`
+	SessionType      string              `json:"session_type"`
 }
 
 type UpdateEvenPayload struct {
@@ -281,6 +287,8 @@ func (e Event) ToDTO() EventDTO {
 		Location:         e.Location,
 		Duration:         e.Duration,
 		Capacity:         e.Capacity,
+		Price:            e.Price,
 		RegistrationLink: e.RegistrationLink,
+		SessionType:      e.SessionType,
 	}
 }