update event model

Author: nevzattalhaozcan

internal/database/connection.go

@@ -67,12 +67,12 @@ func Connect(cfg *config.Config) (*gorm.DB, error) {
 		}
 	}
 
-	if cfg.Server.Environment == "development" {
-        if err := SeedForTest(db); err != nil {
-            log.Printf("seeding error: %v", err)
-            // non-fatal
-        }
-    }
+	// if cfg.Server.Environment == "development" {
+    //     if err := SeedForTest(db); err != nil {
+    //         log.Printf("seeding error: %v", err)
+    //         // non-fatal
+    //     }
+    // }
 
 	log.Println("Database connected successfully")
 	return db, nil

internal/handlers/event.go

@@ -3,7 +3,6 @@ package handlers
 import (
 	"net/http"
 	"strconv"
-	"strings"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-playground/validator/v10"
@@ -43,10 +42,6 @@ func (h *EventHandler) CreateEvent(c *gin.Context) {
 	}
 
 	if err := h.validator.Struct(&req); err != nil {
-		if strings.Contains(err.Error(), "gtfield") {
-            c.JSON(http.StatusBadRequest, gin.H{"error": "end_time must be after start_time"})
-            return
-        }
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}

internal/models/event.go

@@ -8,8 +8,8 @@ type Event struct {
 	Description  string      `json:"description"`
 	ClubID       uint        `json:"club_id" gorm:"not null"`
 	EventType    EventType   `json:"event_type" gorm:"type:varchar(20)"`
-	StartTime    time.Time   `json:"start_time" gorm:"not null"`
-	EndTime      time.Time   `json:"end_time" gorm:"not null"`
+	EventDate    time.Time   `json:"event_date" gorm:"not null"`
+	EventTime    time.Time   `json:"event_time" gorm:"not null"`
 	Location     string      `json:"location,omitempty"`
 	OnlineLink   string      `json:"online_link,omitempty"`
 	MaxAttendees *int        `json:"max_attendees,omitempty"`
@@ -48,8 +48,8 @@ type CreateEventRequest struct {
 	Title        string    `json:"title" binding:"required"`
 	Description  string    `json:"description"`
 	EventType    EventType `json:"event_type" binding:"required,oneof=in_person online"`
-	StartTime    time.Time `json:"start_time" binding:"required"`
-	EndTime      time.Time `json:"end_time" binding:"required,gtfield=StartTime"`
+	EventDate    time.Time `json:"event_date" binding:"required"`
+	EventTime    time.Time `json:"event_time" binding:"required"`
 	Location     string    `json:"location,omitempty"`
 	OnlineLink   string    `json:"online_link,omitempty"`
 	MaxAttendees *int      `json:"max_attendees,omitempty"`
@@ -60,8 +60,8 @@ type UpdateEventRequest struct {
 	Title        *string    `json:"title,omitempty"`
 	Description  *string    `json:"description,omitempty"`
 	EventType    *EventType `json:"event_type,omitempty" binding:"omitempty,oneof=in_person online"`
-	StartTime    *time.Time `json:"start_time,omitempty" binding:"omitempty"`
-	EndTime      *time.Time `json:"end_time,omitempty" binding:"omitempty,gtfield=StartTime"`
+	EventDate    *time.Time `json:"event_date,omitempty" binding:"omitempty"`
+	EventTime    *time.Time `json:"event_time,omitempty" binding:"omitempty"`
 	Location     *string    `json:"location,omitempty"`
 	OnlineLink   *string    `json:"online_link,omitempty"`
 	MaxAttendees *int       `json:"max_attendees,omitempty"`
@@ -78,8 +78,8 @@ type EventResponse struct {
 	Description  string      `json:"description"`
 	ClubID       uint        `json:"club_id"`
 	EventType    EventType   `json:"event_type"`
-	StartTime    string      `json:"start_time"`
-	EndTime      string      `json:"end_time"`
+	EventDate    string      `json:"event_date"`
+	EventTime    string      `json:"event_time"`
 	Location     string      `json:"location,omitempty"`
 	OnlineLink   string      `json:"online_link,omitempty"`
 	MaxAttendees *int        `json:"max_attendees,omitempty"`
@@ -95,8 +95,8 @@ func (e *Event) ToResponse() EventResponse {
 		Description:  e.Description,
 		ClubID:       e.ClubID,
 		EventType:    e.EventType,
-		StartTime:    e.StartTime.Format(time.RFC3339),
-		EndTime:      e.EndTime.Format(time.RFC3339),
+		EventDate:    e.EventDate.Format(time.RFC3339),
+		EventTime:    e.EventTime.Format(time.RFC3339),
 		Location:     e.Location,
 		OnlineLink:   e.OnlineLink,
 		MaxAttendees: e.MaxAttendees,

internal/services/event.go

@@ -39,8 +39,8 @@ func (s *EventService) CreateEvent(clubID uint, req *models.CreateEventRequest)
 		Description:  req.Description,
 		ClubID:       clubID,
 		EventType:    req.EventType,
-		StartTime:    req.StartTime,
-		EndTime:      req.EndTime,
+		EventDate:    req.EventDate,
+		EventTime:    req.EventTime,
 		Location:     req.Location,
 		OnlineLink:   req.OnlineLink,
 		MaxAttendees: req.MaxAttendees,
@@ -109,11 +109,11 @@ func (s *EventService) UpdateEvent(id uint, req *models.UpdateEventRequest) (*mo
 	if req.EventType != nil {
 		event.EventType = *req.EventType
 	}
-	if req.StartTime != nil {
-		event.StartTime = *req.StartTime
+	if req.EventDate != nil {
+		event.EventDate = *req.EventDate
 	}
-	if req.EndTime != nil {
-		event.EndTime = *req.EndTime
+	if req.EventTime != nil {
+		event.EventTime = *req.EventTime
 	}
 	if req.Location != nil {
 		event.Location = *req.Location
@@ -187,10 +187,10 @@ func (s *EventService) refreshClubNextMeeting(clubID uint) error {
 	var next *models.Event
 	for i := range events {
 		e := events[i]
-		if e.StartTime.Before(now) {
+		if e.EventDate.Before(now) {
 			continue
 		}
-		if next == nil || e.StartTime.Before(next.StartTime) {
+		if next == nil || e.EventDate.Before(next.EventDate) {
 			next = &e
 		}
 	}
@@ -221,7 +221,7 @@ func (s *EventService) refreshClubNextMeeting(clubID uint) error {
 
 	topic := next.Title
 	nm := models.NextMeeting{
-		Date: &next.StartTime,
+		Date: &next.EventDate,
 		Location: loc,
 		Topic: &topic,
 	}