Skip to content

Commit 7f8b5f1

Browse files
committed
enhance: return full event details in registration list API
1 parent 1782d03 commit 7f8b5f1

3 files changed

Lines changed: 14 additions & 5 deletions

File tree

app/events/repository/list_registration.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,25 @@ import (
77
)
88

99
func (repo *repository) ListRegistration(ctx context.Context, filter domain.EventFilter, email string) (tData int, data []domain.RegistrationEvent, err error) {
10-
db := repo.db.DB(ctx).Model(&domain.RegistrationEvent{})
10+
db := repo.db.DB(ctx).Model(&domain.RegistrationEvent{}).
11+
Preload("Event").
12+
Preload("Event.Tags").
13+
Preload("Event.Speakers")
1114

1215
if filter.Status != "" {
13-
db = db.Where("status = ?", filter.Status)
16+
db = db.Where("registration_events.status = ?", filter.Status)
1417
}
1518

1619
if filter.StartDate.Valid {
17-
db = db.Where("start_date > ?", filter.StartDate)
20+
db = db.Where("registration_events.created_at >= ?", filter.StartDate)
1821
}
1922

2023
if filter.EndDate.Valid {
21-
db = db.Where("end_date < ?", filter.EndDate)
24+
db = db.Where("registration_events.created_at <= ?", filter.EndDate)
2225
}
2326

2427
if email != "" {
25-
db = db.Where("email = ?", email)
28+
db = db.Where("registration_events.email = ?", email)
2629
}
2730

2831
var totalData int64

app/events/usecase/list_registration_event.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ func (uc usecase) ListRegistration(ctx context.Context, filter domain.EventFilte
2323

2424
for i, data := range datas {
2525
datas[i].ImageProofPayment = fmt.Sprintf("%s/api/v1/public/storage/images/%s", baseURL, data.ImageProofPayment)
26+
27+
// Update event image URL
28+
if datas[i].Event.Image != "" {
29+
datas[i].Event.Image = fmt.Sprintf("%s/api/v1/public/storage/images/%s", baseURL, datas[i].Event.Image)
30+
}
2631
}
2732

2833
return datas, domain.NewPagination(tData, filter.FilterPagination), err

domain/event.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ type RegistrationEvent struct {
235235
CreatedAt time.Time `json:"created_at"`
236236
UpdatedAt null.Time `json:"updated_at"`
237237
DeletedAt null.Time `json:"deleted_at"`
238+
Event Event `json:"event_detail" gorm:"foreignKey:EventID"`
238239
}
239240

240241
func (RegistrationEvent) TableName() string {

0 commit comments

Comments
 (0)