z1glr/golunteer
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

sorting events in backend by date

Browse Source
This commit is contained in:
z1glr
2025-04-01 23:03:11 +02:00
parent 9941b1526c
commit 7b15cfbd77
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/pkg/db/events/events.go
View File

@@ -220,7 +220,7 @@ func Update(event EventPatch) error {
func All() ([]EventData, error) { func All() ([]EventData, error) {
var dbRows []EventData var dbRows []EventData
if err := db.DB.Select(&dbRows, "SELECT * FROM EVENTS"); err != nil { if err := db.DB.Select(&dbRows, "SELECT * FROM EVENTS ORDER BY date"); err != nil {
return nil, err return nil, err
} else { } else {
return dbRows, nil return dbRows, nil

4
backend/pkg/db/users/User.go
View File

@@ -125,7 +125,7 @@ func (u *UserDB) ToUser() (User, error) {
func (userName UserName) WithUserAvailability() ([]events.EventWithAssignmentsUserAvailability, error) { func (userName UserName) WithUserAvailability() ([]events.EventWithAssignmentsUserAvailability, error) {
var events []events.EventWithAssignmentsUserAvailability var events []events.EventWithAssignmentsUserAvailability
if err := db.DB.Select(&events, "SELECT EVENTS.eventID, EVENTS.description, EVENTS.date, USER_AVAILABILITIES.availabilityID FROM EVENTS LEFT JOIN USER_AVAILABILITIES ON EVENTS.eventID = USER_AVAILABILITIES.eventID AND USER_AVAILABILITIES.userName = $1", userName); err != nil { if err := db.DB.Select(&events, "SELECT EVENTS.eventID, EVENTS.description, EVENTS.date, USER_AVAILABILITIES.availabilityID FROM EVENTS LEFT JOIN USER_AVAILABILITIES ON EVENTS.eventID = USER_AVAILABILITIES.eventID AND USER_AVAILABILITIES.userName = $1 ORDER BY date", userName); err != nil {
return nil, err return nil, err
} else { } else {
// get the assignments for every event // get the assignments for every event
@@ -256,7 +256,7 @@ func (userName UserName) GetAssignedEvents() ([]events.EventWithAssignments, err
var eventsDB []events.EventData var eventsDB []events.EventData
// get all the events where the volunteer is assigned a task // get all the events where the volunteer is assigned a task
if err := db.DB.Select(&eventsDB, "SELECT DISTINCT EVENTS.date, EVENTS.description, EVENTS.eventID FROM USER_ASSIGNMENTS INNER JOIN EVENTS ON USER_ASSIGNMENTS.eventID = EVENTS.eventID WHERE userName = $1 AND EVENTS.date > datetime('now')", userName); err != nil { if err := db.DB.Select(&eventsDB, "SELECT DISTINCT EVENTS.date, EVENTS.description, EVENTS.eventID FROM USER_ASSIGNMENTS INNER JOIN EVENTS ON USER_ASSIGNMENTS.eventID = EVENTS.eventID WHERE userName = $1 AND EVENTS.date > datetime('now') ORDER BY EVENTS.date", userName); err != nil {
return nil, err return nil, err
} else { } else {
// for each event create an event with assignments // for each event create an event with assignments