update event model

Author: nevzattalhaozcan

internal/models/event.go

@@ -8,12 +8,12 @@ type Event struct {
 	Description  string      `json:"description"`
 	ClubID       uint        `json:"club_id" gorm:"not null"`
 	EventType    EventType   `json:"event_type" gorm:"type:varchar(20)"`
-	EventDate    time.Time   `json:"event_date" gorm:"not null"`
-	EventTime    time.Time   `json:"event_time" gorm:"not null"`
+	EventDate    time.Time   `json:"event_date" gorm:"type:date;not null"`
+	EventTime    time.Time   `json:"event_time" gorm:"type:time;not null"`
 	Location     string      `json:"location,omitempty"`
 	OnlineLink   string      `json:"online_link,omitempty"`
 	MaxAttendees *int        `json:"max_attendees,omitempty"`
-	IsPublic	 bool        `json:"is_public" gorm:"default:false"`
+	IsPublic     bool        `json:"is_public" gorm:"default:false"`
 	CreatedAt    time.Time   `json:"created_at" gorm:"autoCreateTime"`
 	Club         Club        `json:"club" gorm:"foreignKey:ClubID"`
 	RSVPs        []EventRSVP `json:"rsvps,omitempty"`
@@ -48,24 +48,24 @@ type CreateEventRequest struct {
 	Title        string    `json:"title" binding:"required"`
 	Description  string    `json:"description"`
 	EventType    EventType `json:"event_type" binding:"required,oneof=in_person online"`
-	EventDate    time.Time `json:"event_date" binding:"required"`
-	EventTime    time.Time `json:"event_time" binding:"required"`
+	EventDate    time.Time `json:"event_date" binding:"required" time_format:"2006-01-02"`
+	EventTime    time.Time `json:"event_time" binding:"required" time_format:"15:04"`
 	Location     string    `json:"location,omitempty"`
 	OnlineLink   string    `json:"online_link,omitempty"`
 	MaxAttendees *int      `json:"max_attendees,omitempty"`
-	IsPublic	 bool      `json:"is_public" gorm:"default:false"`
+	IsPublic     bool      `json:"is_public" gorm:"default:false"`
 }
 
 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"`
-	EventDate    *time.Time `json:"event_date,omitempty" binding:"omitempty"`
-	EventTime    *time.Time `json:"event_time,omitempty" binding:"omitempty"`
+	EventDate    *time.Time `json:"event_date,omitempty" binding:"omitempty" time_format:"2006-01-02"`
+	EventTime    *time.Time `json:"event_time,omitempty" binding:"omitempty" time_format:"15:04"`
 	Location     *string    `json:"location,omitempty"`
 	OnlineLink   *string    `json:"online_link,omitempty"`
 	MaxAttendees *int       `json:"max_attendees,omitempty"`
-	IsPublic	 *bool      `json:"is_public,omitempty"`
+	IsPublic     *bool      `json:"is_public,omitempty"`
 }
 
 type RSVPRequest struct {
@@ -95,8 +95,8 @@ func (e *Event) ToResponse() EventResponse {
 		Description:  e.Description,
 		ClubID:       e.ClubID,
 		EventType:    e.EventType,
-		EventDate:    e.EventDate.Format(time.RFC3339),
-		EventTime:    e.EventTime.Format(time.RFC3339),
+		EventDate:    e.EventDate.Format("2006-01-02"),
+		EventTime:    e.EventTime.Format("15:04"),
 		Location:     e.Location,
 		OnlineLink:   e.OnlineLink,
 		MaxAttendees: e.MaxAttendees,

internal/services/event.go

@@ -183,15 +183,34 @@ func (s *EventService) refreshClubNextMeeting(clubID uint) error {
 		return err
 	}
 
+	combine := func(d, t time.Time) time.Time {
+		loc := d.Location()
+		if loc == time.UTC && t.Location() != time.UTC {
+			loc = t.Location()
+		}
+		return time.Date(
+			d.Year(), d.Month(), d.Day(),
+			t.Hour(), t.Minute(), t.Second(), t.Nanosecond(),
+			loc,
+		)
+	}
+
 	now := time.Now()
-	var next *models.Event
+	var (
+		nextEvent *models.Event
+		nextStart time.Time
+	)
+
 	for i := range events {
-		e := events[i]
-		if e.EventDate.Before(now) {
+		event := &events[i]
+		eventStart := combine(event.EventDate, event.EventTime)
+
+		if eventStart.Before(now) {
 			continue
 		}
-		if next == nil || e.EventDate.Before(next.EventDate) {
-			next = &e
+		if nextEvent == nil || eventStart.Before(nextStart) {
+			nextEvent = event
+			nextStart = eventStart
 		}
 	}
 
@@ -200,30 +219,30 @@ func (s *EventService) refreshClubNextMeeting(clubID uint) error {
 		return err
 	}
 
-	if next == nil {
+	if nextEvent == nil {
 		club.NextMeeting = nil
 		return s.clubRepo.Update(club)
 	}
 
 	var loc *string
-	switch next.EventType {
+	switch nextEvent.EventType {
 	case models.EventOnline:
-		if next.OnlineLink != "" {
-			l := next.OnlineLink
+		if nextEvent.OnlineLink != "" {
+			l := nextEvent.OnlineLink
 			loc = &l
 		}
 	default:
-		if next.Location != "" {
-			l := next.Location
+		if nextEvent.Location != "" {
+			l := nextEvent.Location
 			loc = &l
-		}	
+		}
 	}
 
-	topic := next.Title
+	topic := nextEvent.Title
 	nm := models.NextMeeting{
-		Date: &next.EventDate,
+		Date:     &nextEvent.EventDate,
 		Location: loc,
-		Topic: &topic,
+		Topic:    &topic,
 	}
 	if b, merr := json.Marshal(&nm); merr == nil {
 		club.NextMeeting = b
@@ -233,7 +252,7 @@ func (s *EventService) refreshClubNextMeeting(clubID uint) error {
 }
 
 func (s *EventService) ClubRepo() repository.ClubRepository {
-    return s.clubRepo
+	return s.clubRepo
 }
 
 func (s *EventService) GetPublicEvents() ([]models.EventResponse, error) {
@@ -249,4 +268,4 @@ func (s *EventService) GetPublicEvents() ([]models.EventResponse, error) {
 	}
 
 	return responses, nil
-}
+}