started work on task assignment table

This commit is contained in:
z1glr
2025-01-11 12:27:41 +00:00
parent 2a746cf76d
commit 4f203704a6
13 changed files with 226 additions and 157 deletions

View File

@@ -3,6 +3,7 @@ package events
import (
"github.com/johannesbuehl/golunteer/backend/pkg/db"
"github.com/johannesbuehl/golunteer/backend/pkg/db/assignments"
"github.com/johannesbuehl/golunteer/backend/pkg/db/availabilities"
"github.com/johannesbuehl/golunteer/backend/pkg/logger"
)
@@ -11,6 +12,11 @@ type EventWithAssignment struct {
Tasks map[string]*string `json:"tasks"`
}
type EventWithAvailabilities struct {
EventWithAssignment
Availabilities map[string]string `json:"availabilities"`
}
type eventDataDB struct {
Id int `db:"id" json:"id"`
Date string `db:"date" json:"date" validate:"required"`
@@ -18,18 +24,34 @@ type eventDataDB struct {
}
// transform the database-entry to an Event
func (e *eventDataDB) Event() (EventWithAssignment, error) {
// get the availabilites associated with the event
func (e eventDataDB) Event() (EventWithAssignment, error) {
// get the assignments associated with the event
if assignemnts, err := assignments.Event(e.Id); err != nil {
return EventWithAssignment{}, err
} else {
return EventWithAssignment{
eventDataDB: *e,
eventDataDB: e,
Tasks: assignemnts,
}, nil
}
}
func (e eventDataDB) EventWithAvailabilities() (EventWithAvailabilities, error) {
// get the event with assignments
if event, err := e.Event(); err != nil {
return EventWithAvailabilities{}, err
// get the availabilities
} else if availabilities, err := availabilities.Event(e.Id); err != nil {
return EventWithAvailabilities{}, err
} else {
return EventWithAvailabilities{
EventWithAssignment: event,
Availabilities: availabilities,
}, nil
}
}
type EventCreate struct {
eventDataDB
Tasks []int `json:"tasks" validate:"required,min=1"`
@@ -98,6 +120,25 @@ func WithAssignments() ([]EventWithAssignment, error) {
}
}
func WithAvailabilities() ([]EventWithAvailabilities, error) {
// get all events
if eventsDB, err := All(); err != nil {
return nil, err
} else {
events := make([]EventWithAvailabilities, len(eventsDB))
for ii, e := range eventsDB {
if ev, err := e.EventWithAvailabilities(); err != nil {
logger.Logger.Error().Msgf("can't get availabilities for event with id = %d: %v", e.Id, err)
} else {
events[ii] = ev
}
}
return events, nil
}
}
func UserPending(userName string) (int, error) {
var result struct {
Count int `db:"count(*)"`