diff --git a/backend/pkg/db/assignments/assignments.go b/backend/pkg/db/assignments/assignments.go deleted file mode 100644 index cd8ba80..0000000 --- a/backend/pkg/db/assignments/assignments.go +++ /dev/null @@ -1,22 +0,0 @@ -package assignments - -import ( - "github.com/johannesbuehl/golunteer/backend/pkg/db" -) - -type EventAssignment struct { - TaskID int `db:"taskID" json:"taskID"` - TaskName string `db:"taskName" json:"taskName"` - UserName *string `db:"userName" json:"userName"` -} - -func Event(eventID int) ([]EventAssignment, error) { - // get the assignments from the database - var assignmentRows []EventAssignment - - if err := db.DB.Select(&assignmentRows, "SELECT USERS.name AS userName, taskID, TASKS.name AS taskName FROM USER_ASSIGNMENTS LEFT JOIN USERS ON USER_ASSIGNMENTS.userName = USERS.name LEFT JOIN TASKS ON USER_ASSIGNMENTS.taskID = TASKS.id WHERE USER_ASSIGNMENTS.eventID = ?", eventID); err != nil { - return nil, err - } else { - return assignmentRows, nil - } -} diff --git a/backend/pkg/db/availabilities/availabilities.go b/backend/pkg/db/availabilities/availabilities.go index 546e63d..733a723 100644 --- a/backend/pkg/db/availabilities/availabilities.go +++ b/backend/pkg/db/availabilities/availabilities.go @@ -5,24 +5,24 @@ import ( ) type AvailabilityDB struct { - Id int `db:"id" json:"id" validate:"required"` - Availability `validate:"required"` + AvailabilityID int `db:"availabilityID" json:"availabilityID" validate:"required"` + Availability `validate:"required"` } type Availability struct { - Name string `db:"name" json:"name" validate:"required"` - Enabled bool `db:"enabled" json:"enabled" validate:"required"` - Color string `db:"color" json:"color" validate:"required"` + AvailabilityName string `db:"availabilityName" json:"availabilityName" validate:"required"` + Enabled bool `db:"enabled" json:"enabled"` + Color string `db:"color" json:"color" validate:"required"` } func Add(a Availability) error { - _, err := db.DB.NamedExec("INSERT INTO AVAILABILITIES (name, color, enabled) VALUES (:name, :color, :enabled)", a) + _, err := db.DB.NamedExec("INSERT INTO AVAILABILITIES (availabilityName, color, enabled) VALUES (:availabilityName, :color, :enabled)", a) return err } func Update(a AvailabilityDB) error { - _, err := db.DB.NamedExec("UPDATE AVAILABILITIES SET name = :name, color = :color, enabled = :enabled WHERE id = :id", a) + _, err := db.DB.NamedExec("UPDATE AVAILABILITIES SET availabilityName = :availabilityName, color = :color, enabled = :enabled WHERE availabilityID = :availabilityID", a) return err } @@ -46,10 +46,10 @@ func Keys() (map[int]Availability, error) { availabilities := map[int]Availability{} for _, a := range availabilitiesRaw { - availabilities[a.Id] = Availability{ - Name: a.Name, - Enabled: a.Enabled, - Color: a.Color, + availabilities[a.AvailabilityID] = Availability{ + AvailabilityName: a.AvailabilityName, + Enabled: a.Enabled, + Color: a.Color, } } @@ -58,7 +58,7 @@ func Keys() (map[int]Availability, error) { } func Delete(id int) error { - _, err := db.DB.Exec("DELETE FROM AVAILABILITIES WHERE id = $1", id) + _, err := db.DB.Exec("DELETE FROM AVAILABILITIES WHERE availabilityID = $1", id) return err } diff --git a/backend/pkg/db/availabilities/userAvailabilities.go b/backend/pkg/db/availabilities/userAvailabilities.go index 3c20082..3ce3c01 100644 --- a/backend/pkg/db/availabilities/userAvailabilities.go +++ b/backend/pkg/db/availabilities/userAvailabilities.go @@ -24,7 +24,7 @@ func Event(eventID int) (map[string]string, error) { return nil, err } else { for _, a := range availabilitiesRows { - eventAvailabilities[a.UserName] = availabilitiesMap[a.AvailabilityID].Name + eventAvailabilities[a.UserName] = availabilitiesMap[a.AvailabilityID].AvailabilityName } return eventAvailabilities, nil diff --git a/backend/pkg/db/db.go b/backend/pkg/db/db.go index 71eba28..52b07b8 100644 --- a/backend/pkg/db/db.go +++ b/backend/pkg/db/db.go @@ -31,7 +31,7 @@ func init() { var admin struct { Admin bool `db:"admin"` } - if err := DB.QueryRowx("SELECT admin FROM USERS WHERE name = 'admin'").StructScan(&admin); err != nil { + if err := DB.QueryRowx("SELECT admin FROM USERS WHERE userName = 'admin'").StructScan(&admin); err != nil { // if the error isn't because there was no result, it's a real one if err != sql.ErrNoRows { panic(fmt.Errorf("can't query for the admin-user: %v", err)) diff --git a/backend/pkg/db/events/events.go b/backend/pkg/db/events/events.go index 70b410d..835903b 100644 --- a/backend/pkg/db/events/events.go +++ b/backend/pkg/db/events/events.go @@ -4,14 +4,30 @@ import ( "slices" "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" ) +type EventData struct { + EventID int `db:"eventID" json:"eventID" validate:"required"` + Date string `db:"date" json:"date" validate:"required"` + Description string `db:"description" json:"description"` +} + +type EventPatch struct { + EventData + Tasks []int `json:"tasks" validate:"required,min=1"` +} + +type EventAssignment struct { + TaskID int `db:"taskID" json:"taskID"` + TaskName string `db:"taskName" json:"taskName"` + UserName *string `db:"userName" json:"userName"` +} + type EventWithAssignment struct { - eventDataDB - Tasks []assignments.EventAssignment `json:"tasks"` + EventData + Tasks []EventAssignment `json:"tasks"` } type EventWithAvailabilities struct { @@ -19,32 +35,32 @@ type EventWithAvailabilities struct { Availabilities map[string]string `json:"availabilities"` } -type eventDataDB struct { - ID int `db:"id" json:"id" validate:"required"` - Date string `db:"date" json:"date" validate:"required"` +type EventCreate struct { + Date string `db:"date" json:"date" validate:"required,datetime=2006-01-02T15:04:05.999999999Z"` Description string `db:"description" json:"description"` + Tasks []int `json:"tasks" validate:"required,min=1"` } // transform the database-entry to an Event -func (e eventDataDB) Event() (EventWithAssignment, error) { +func (e EventData) Event() (EventWithAssignment, error) { // get the assignments associated with the event - if assignemnts, err := assignments.Event(e.ID); err != nil { + if assignemnts, err := Assignments(e.EventID); err != nil { return EventWithAssignment{}, err } else { return EventWithAssignment{ - eventDataDB: e, - Tasks: assignemnts, + EventData: e, + Tasks: assignemnts, }, nil } } -func (e eventDataDB) EventWithAvailabilities() (EventWithAvailabilities, error) { +func (e EventData) 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 { + } else if availabilities, err := availabilities.Event(e.EventID); err != nil { return EventWithAvailabilities{}, err } else { return EventWithAvailabilities{ @@ -54,12 +70,6 @@ func (e eventDataDB) EventWithAvailabilities() (EventWithAvailabilities, error) } } -type EventCreate struct { - Date string `db:"date" json:"date" validate:"required,datetime=2006-01-02T15:04:05.999999999Z"` - Description string `db:"description" json:"description"` - Tasks []int `json:"tasks" validate:"required,min=1"` -} - func Create(event EventCreate) error { // convert the date to utc if result, err := db.DB.NamedExec("INSERT INTO EVENTS (date, description) VALUES (:date, :description)", event); err != nil { @@ -86,7 +96,7 @@ func Create(event EventCreate) error { // create the assignments if _, err := db.DB.NamedExec("INSERT INTO USER_ASSIGNMENTS (eventID, taskID) VALUES (:eventID, :taskID)", tasks); err != nil { // delete the event again - db.DB.Query("DELETE FROM EVENTS WHERE id = ?", id) + db.DB.Query("DELETE FROM EVENTS WHERE eventID = ?", id) return err } @@ -95,25 +105,20 @@ func Create(event EventCreate) error { return nil } -type EventPatch struct { - eventDataDB - Tasks []int `json:"tasks" validate:"required,min=1"` -} - func Update(event EventPatch) error { // update the event itself - if _, err := db.DB.NamedExec("UPDATE EVENTS SET description = :description, date = :date WHERE id = :id", event); err != nil { + if _, err := db.DB.NamedExec("UPDATE EVENTS SET description = :description, date = :date WHERE eventID = :id", event); err != nil { return err // get the tasks currently assigned to the event } else { type TaskID struct { - ID int `db:"taskID"` + TaskID int `db:"taskID"` } var taskRows []TaskID - if err := db.DB.Select(&taskRows, "SELECT taskID FROM USER_ASSIGNMENTS WHERE eventID = ?", event.ID); err != nil { + if err := db.DB.Select(&taskRows, "SELECT taskID FROM USER_ASSIGNMENTS WHERE eventID = $1", event.EventID); err != nil { return err } else { type Task struct { @@ -125,17 +130,17 @@ func Update(event EventPatch) error { deleteRows := []Task{} for _, row := range taskRows { - if !slices.Contains(event.Tasks, row.ID) { - deleteRows = append(deleteRows, Task{TaskID: row, EventID: event.ID}) + if !slices.Contains(event.Tasks, row.TaskID) { + deleteRows = append(deleteRows, Task{TaskID: row, EventID: event.EventID}) } } // extract the rows that need to be created createRows := []Task{} - for _, id := range event.Tasks { - if !slices.Contains(taskRows, TaskID{ID: id}) { - createRows = append(createRows, Task{TaskID: TaskID{ID: id}, EventID: event.ID}) + for _, taskID := range event.Tasks { + if !slices.Contains(taskRows, TaskID{TaskID: taskID}) { + createRows = append(createRows, Task{TaskID: TaskID{TaskID: taskID}, EventID: event.EventID}) } } @@ -158,8 +163,8 @@ func Update(event EventPatch) error { } } -func All() ([]eventDataDB, error) { - var dbRows []eventDataDB +func All() ([]EventData, error) { + var dbRows []EventData if err := db.DB.Select(&dbRows, "SELECT * FROM EVENTS"); err != nil { return nil, err @@ -177,7 +182,7 @@ func WithAssignments() ([]EventWithAssignment, error) { for ii, e := range eventsDB { if ev, err := e.Event(); err != nil { - logger.Logger.Error().Msgf("can't get assignments for event with id = %d: %v", e.ID, err) + logger.Logger.Error().Msgf("can't get assignments for event with assignmentID = %d: %v", e.EventID, err) } else { events[ii] = ev } @@ -196,7 +201,7 @@ func WithAvailabilities() ([]EventWithAvailabilities, error) { 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) + logger.Logger.Error().Msgf("can't get availabilities for event with eventID = %d: %v", e.EventID, err) } else { events[ii] = ev } @@ -206,12 +211,22 @@ func WithAvailabilities() ([]EventWithAvailabilities, error) { } } -func UserPending(userName string) (int, error) { +func UserPending(userName string) ([]EventData, error) { + var result []EventData + + if err := db.DB.Select(&result, "SELECT eventID, date, description FROM EVENTS WHERE NOT EXISTS (SELECT 1 FROM USER_AVAILABILITIES WHERE USER_AVAILABILITIES.eventID = EVENTS.eventID AND USER_AVAILABILITIES.userName = ?)", userName); err != nil { + return nil, err + } else { + return result, nil + } +} + +func UserPendingCount(userName string) (int, error) { var result struct { Count int `db:"count(*)"` } - if err := db.DB.QueryRowx("SELECT count(*) FROM EVENTS WHERE NOT EXISTS (SELECT 1 FROM USER_AVAILABILITIES WHERE USER_AVAILABILITIES.eventID = EVENTS.id AND USER_AVAILABILITIES.userName = ?)", userName).StructScan(&result); err != nil { + if err := db.DB.QueryRowx("SELECT count(*) FROM EVENTS WHERE NOT EXISTS (SELECT 1 FROM USER_AVAILABILITIES WHERE USER_AVAILABILITIES.eventID = EVENTS.eventID AND USER_AVAILABILITIES.userName = ?)", userName).StructScan(&result); err != nil { return 0, err } else { return result.Count, nil @@ -219,7 +234,35 @@ func UserPending(userName string) (int, error) { } func Delete(eventId int) error { - _, err := db.DB.Exec("DELETE FROM EVENTS WHERE id = ?", eventId) + _, err := db.DB.Exec("DELETE FROM EVENTS WHERE eventID = ?", eventId) return err } + +func Assignments(eventID int) ([]EventAssignment, error) { + // get the assignments from the database + var assignmentRows []EventAssignment + + if err := db.DB.Select(&assignmentRows, "SELECT USERS.userName, TASKS.taskID, TASKS.taskName FROM USER_ASSIGNMENTS LEFT JOIN USERS ON USER_ASSIGNMENTS.userName = USERS.userName LEFT JOIN TASKS ON USER_ASSIGNMENTS.taskID = TASKS.taskID WHERE USER_ASSIGNMENTS.eventID = ?", eventID); err != nil { + return nil, err + } else { + return assignmentRows, nil + } +} + +func User(userName string) ([]EventWithAssignment, error) { + // get all assignments of the user + + // var events []EventWithAssignment + var events []struct { + EventData + TaskID int `db:"taskID"` + UserName string `db:"userName"` + } + + if err := db.DB.Select(&events, "SELECT DISTINCT * FROM USER_ASSIGNMENTS INNER JOIN EVENTS ON USER_ASSIGNMENTS.eventID = EVENTS.eventID WHERE userName = $1", userName); err != nil { + return nil, err + } else { + return nil, nil + } +} diff --git a/backend/pkg/db/setup.go b/backend/pkg/db/setup.go index 7697483..c6bc7e5 100644 --- a/backend/pkg/db/setup.go +++ b/backend/pkg/db/setup.go @@ -38,17 +38,17 @@ func setup() { // create an admin-user user := struct { - Name string `db:"name"` + UserName string `db:"userName"` Password []byte `db:"password"` Admin bool `db:"admin"` TokenID string `db:"tokenID"` }{ - Name: "admin", + UserName: "admin", Password: passwordHash, Admin: true, TokenID: uuid.NewString(), } - if _, err := DB.NamedExec("INSERT INTO USERS (name, password, tokenID, admin) VALUES (:name, :password, :tokenID, :admin)", &user); err != nil { + if _, err := DB.NamedExec("INSERT INTO USERS (userName, password, tokenID, admin) VALUES (:userName, :password, :tokenID, :admin)", &user); err != nil { panic(fmt.Errorf("can't insert admin-user into the database: %v", err)) } diff --git a/backend/pkg/db/tasks/tasks.go b/backend/pkg/db/tasks/tasks.go index 9a69ced..6b01492 100644 --- a/backend/pkg/db/tasks/tasks.go +++ b/backend/pkg/db/tasks/tasks.go @@ -5,13 +5,13 @@ import ( ) type TaskDB struct { - ID int `json:"id" db:"id" validate:"required"` - Task `valdate:"required" ` + TaskID int `json:"taskID" db:"taskID" validate:"required"` + Task `valdate:"required" ` } type Task struct { - Name string `json:"name" db:"name" validate:"required"` - Enabled bool `json:"enabled" db:"enabled" validate:"required"` + TaskName string `json:"taskName" db:"taskName" validate:"required"` + Enabled bool `json:"enabled" db:"enabled" validate:"required"` } func GetSlice() ([]TaskDB, error) { @@ -33,9 +33,9 @@ func GetMap() (map[int]Task, error) { tasks := map[int]Task{} for _, a := range tasksRaw { - tasks[a.ID] = Task{ - Name: a.Name, - Enabled: a.Enabled, + tasks[a.TaskID] = Task{ + TaskName: a.TaskName, + Enabled: a.Enabled, } } @@ -44,19 +44,19 @@ func GetMap() (map[int]Task, error) { } func Add(t Task) error { - _, err := db.DB.NamedExec("INSERT INTO TASKS (name, enabled) VALUES (:name, :enabled)", &t) + _, err := db.DB.NamedExec("INSERT INTO TASKS (taskName, enabled) VALUES (:taskName, :enabled)", &t) return err } func Update(t TaskDB) error { - _, err := db.DB.NamedExec("UPDATE TASKS set name = :name, enabled = :enabled WHERE id = :id", &t) + _, err := db.DB.NamedExec("UPDATE TASKS set taskName = :taskName, enabled = :enabled WHERE taskID = :taskID", &t) return err } func Delete(i int) error { - _, err := db.DB.Exec("DELETE FROM TASKS WHERE id = $1", i) + _, err := db.DB.Exec("DELETE FROM TASKS WHERE taskID = $1", i) return err } diff --git a/backend/pkg/db/users/users.go b/backend/pkg/db/users/users.go index 7ce0baf..f1e493b 100644 --- a/backend/pkg/db/users/users.go +++ b/backend/pkg/db/users/users.go @@ -7,8 +7,8 @@ import ( ) type User struct { - Name string `db:"name" json:"userName"` - Admin bool `db:"admin" json:"admin"` + UserName string `db:"userName" json:"userName"` + Admin bool `db:"admin" json:"admin"` } type UserChangePassword struct { @@ -25,7 +25,7 @@ func Get() ([]User, error) { // get the users from the database var users []User - if err := db.DB.Select(&users, "SELECT name, admin FROM USERS"); err != nil { + if err := db.DB.Select(&users, "SELECT userName, admin FROM USERS"); err != nil { return nil, err } else { return users, nil @@ -37,7 +37,7 @@ func TokenID(userName string) (string, error) { TokenID string `db:"tokenID"` } - err := db.DB.Get(&dbResult, "SELECT tokenID FROM USERS WHERE name = ?", userName) + err := db.DB.Get(&dbResult, "SELECT tokenID FROM USERS WHERE userName = ?", userName) return dbResult.TokenID, err } @@ -63,7 +63,7 @@ func Add(user UserAdd) error { TokenID: uuid.NewString(), } - _, err := db.DB.NamedExec("INSERT INTO USERS (name, password, admin, tokenID) VALUES (:userName, :password, :admin, :tokenID)", insertUser) + _, err := db.DB.NamedExec("INSERT INTO USERS (userName, password, admin, tokenID) VALUES (:userName, :password, :admin, :tokenID)", insertUser) return err } @@ -93,19 +93,19 @@ func ChangePassword(user UserChangePassword) (string, error) { } func ChangeName(userName, newName string) error { - _, err := db.DB.Exec("UPDATE USERS SET name = ? WHERE name = ?", newName, userName) + _, err := db.DB.Exec("UPDATE USERS SET userName = ? WHERE userName = ?", newName, userName) return err } func SetAdmin(userName string, admin bool) error { - _, err := db.DB.Exec("UPDATE USERS SET admin = ? WHERE name = ?", admin, userName) + _, err := db.DB.Exec("UPDATE USERS SET admin = ? WHERE userName = ?", admin, userName) return err } func Delete(userName string) error { - _, err := db.DB.Exec("DELETE FROM USERS WHERE name = $1", userName) + _, err := db.DB.Exec("DELETE FROM USERS WHERE userName = $1", userName) return err } diff --git a/backend/pkg/router/availabilities.go b/backend/pkg/router/availabilities.go index 6d7ddb8..924e1c7 100644 --- a/backend/pkg/router/availabilities.go +++ b/backend/pkg/router/availabilities.go @@ -5,130 +5,93 @@ import ( "github.com/johannesbuehl/golunteer/backend/pkg/db/availabilities" ) -func getAvailabilities(args HandlerArgs) responseMessage { - response := responseMessage{} - +func (a *Handler) getAvailabilities() { // get all the availabilites from the database if avails, err := availabilities.Slice(); err != nil { - response.Status = fiber.StatusInternalServerError + a.Status = fiber.StatusInternalServerError logger.Error().Msgf("can't get availabilites: %v", err) - - return response } else { - response.Data = avails - - return response + a.Data = avails } } -func postAvailability(args HandlerArgs) responseMessage { - response := responseMessage{} - +func (a *Handler) postAvailability() { // check admin - if !args.User.Admin { - response.Status = fiber.StatusUnauthorized + if !a.Admin { + a.Status = fiber.StatusUnauthorized logger.Warn().Msg("user is no admin") - return response - // parse the body } else { var body availabilities.Availability - if err := args.C.BodyParser(&body); err != nil { - response.Status = fiber.StatusBadRequest + if err := a.C.BodyParser(&body); err != nil { + a.Status = fiber.StatusBadRequest logger.Log().Msgf("can't parse body: %v", err) - return response - // validate the body - } else if err := validate.Struct(&response); err != nil { - response.Status = fiber.StatusBadRequest + } else if err := validate.Struct(&body); err != nil { + a.Status = fiber.StatusBadRequest logger.Log().Msgf("invalid body: %v", err) - return response } else if err := availabilities.Add(body); err != nil { - response.Status = fiber.StatusInternalServerError + a.Status = fiber.StatusInternalServerError logger.Error().Msgf("can't add availability: %v", err) - - return response - } else { - return response } } } -func patchAvailabilitiy(args HandlerArgs) responseMessage { - response := responseMessage{} - +func (a *Handler) patchAvailabilitiy() { // check admin - if !args.User.Admin { - response.Status = fiber.StatusUnauthorized + if !a.Admin { + a.Status = fiber.StatusUnauthorized logger.Warn().Msg("user is no admin") - return response - // parse the body } else { var body availabilities.AvailabilityDB - if err := args.C.BodyParser(&body); err != nil { - response.Status = fiber.StatusBadRequest + if err := a.C.BodyParser(&body); err != nil { + a.Status = fiber.StatusBadRequest logger.Log().Msgf("can't parse body: %v", err) - return response - // validate the body - } else if err := validate.Struct(&response); err != nil { - response.Status = fiber.StatusBadRequest + } else if err := validate.Struct(&body); err != nil { + a.Status = fiber.StatusBadRequest logger.Log().Msgf("invalid body: %v", err) - - return response } else if err := availabilities.Update(body); err != nil { - response.Status = fiber.StatusInternalServerError + a.Status = fiber.StatusInternalServerError logger.Error().Msgf("can't update availability: %v", err) - - return response - } else { - return response } } } -func deleteAvailability(args HandlerArgs) responseMessage { +func (a *Handler) deleteAvailability() { // check admin - if !args.User.Admin { + if !a.Admin { logger.Warn().Msg("availability-deletion failed: user is no admin") - return responseMessage{ - Status: fiber.StatusUnauthorized, - } + a.Status = fiber.StatusUnauthorized // parse the query - } else if taskID := args.C.QueryInt("id", -1); taskID == -1 { - logger.Log().Msg("availability-deletion failed: invalid query: doesn't include \"id\"") + } else if taskID := a.C.QueryInt("availabilityID", -1); taskID == -1 { + logger.Log().Msg("availability-deletion failed: invalid query: doesn't include \"availabilityID\"") - return responseMessage{ - Status: fiber.StatusBadRequest, - } + a.Status = fiber.StatusBadRequest // delete the task from the database } else if err := availabilities.Delete(taskID); err != nil { logger.Error().Msgf("availability-deletion failed: can't delete task from database: %v", err) - return responseMessage{ - Status: fiber.StatusInternalServerError, - } - } else { - return responseMessage{} + a.Status = fiber.StatusInternalServerError } } diff --git a/backend/pkg/router/events.go b/backend/pkg/router/events.go index 5ebb9c6..0709b0d 100644 --- a/backend/pkg/router/events.go +++ b/backend/pkg/router/events.go @@ -5,144 +5,138 @@ import ( "github.com/johannesbuehl/golunteer/backend/pkg/db/events" ) -func postEvent(args HandlerArgs) responseMessage { - response := responseMessage{} - +func (a *Handler) postEvent() { // check admin - if !args.User.Admin { - response.Status = fiber.StatusForbidden + if !a.Admin { + a.Status = fiber.StatusForbidden } else { // write the event var body events.EventCreate // try to parse the body - if err := args.C.BodyParser(&body); err != nil { - response.Status = fiber.StatusBadRequest + if err := a.C.BodyParser(&body); err != nil { + a.Status = fiber.StatusBadRequest logger.Log().Msgf("can't parse body: %v", err) // validate the parsed body } else if err := validate.Struct(body); err != nil { - response.Status = fiber.StatusBadRequest + a.Status = fiber.StatusBadRequest logger.Log().Msgf("invalid body: %v", err) // create the event } else if err := events.Create(body); err != nil { - response.Status = fiber.StatusInternalServerError + a.Status = fiber.StatusInternalServerError logger.Error().Msgf("can't create event: %v", err) } } - - return response } -func patchEvent(args HandlerArgs) responseMessage { - response := responseMessage{} - +func (a *Handler) patchEvent() { // check admin - if !args.User.Admin { - response.Status = fiber.StatusForbidden + if !a.Admin { + a.Status = fiber.StatusForbidden } else { // parse the body var body events.EventPatch - if err := args.C.BodyParser(&body); err != nil { - response.Status = fiber.StatusBadRequest + if err := a.C.BodyParser(&body); err != nil { + a.Status = fiber.StatusBadRequest logger.Log().Msgf("can't parse body: %v", err) // validate the body } else if err := validate.Struct(body); err != nil { - response.Status = fiber.StatusBadRequest + a.Status = fiber.StatusBadRequest logger.Log().Msgf("ivnalid body: %v", err) // update the event } else if err := events.Update(body); err != nil { - response.Status = fiber.StatusInternalServerError + a.Status = fiber.StatusInternalServerError logger.Error().Msgf("updating the event failed: %v", err) } } - return response } -func getEventsAssignments(args HandlerArgs) responseMessage { - response := responseMessage{} - +func (a *Handler) getEventsAssignments() { if events, err := events.WithAssignments(); err != nil { - response.Status = fiber.StatusInternalServerError + a.Status = fiber.StatusInternalServerError logger.Error().Msgf("can't retrieve events with assignments: %v", err) } else { - response.Data = events + a.Data = events } - - return response } -func getEventsAvailabilities(args HandlerArgs) responseMessage { - response := responseMessage{} - +func (a *Handler) getEventsAvailabilities() { // check for admin - if !args.User.Admin { - response.Status = fiber.StatusForbidden + if !a.Admin { + a.Status = fiber.StatusForbidden } else { if events, err := events.WithAvailabilities(); err != nil { - response.Status = fiber.StatusInternalServerError + a.Status = fiber.StatusInternalServerError logger.Error().Msgf("can't retrieve events with availabilities: %v", err) } else { - response.Data = events + a.Data = events } } - - return response } -func getEventsUserPending(args HandlerArgs) responseMessage { - response := responseMessage{} +func (a *Handler) getEventsUserPending() { + if events, err := events.UserPending(a.UserName); err != nil { + a.Status = fiber.StatusInternalServerError - if count, err := events.UserPending(args.User.UserName); err != nil { - response.Status = fiber.StatusInternalServerError - - logger.Warn().Msgf("can't query database for users %q pending events: %v", args.User.UserName, err) + logger.Warn().Msgf("can't query database for users %q pending events: %v", a.UserName, err) } else { - response.Data = count + a.Data = events } - - return response } -func deleteEvent(args HandlerArgs) responseMessage { +func (a *Handler) getEventsUserPendingCount() { + if count, err := events.UserPendingCount(a.UserName); err != nil { + a.Status = fiber.StatusInternalServerError + + logger.Warn().Msgf("can't query database for users %q pending events: %v", a.UserName, err) + } else { + a.Data = count + } +} + +func (a *Handler) getEventsUserAssigned() { + // retrieve the events from the database + if events, err := events.User(a.UserName); err != nil { + a.Status = fiber.StatusBadRequest + + logger.Log().Msgf("retrieval of user-assigned-events failed: %v", err) + } else { + a.Data = events + } +} + +func (a *Handler) deleteEvent() { // check for admin - if !args.User.Admin { + if !a.Admin { logger.Warn().Msg("event-delete failed: user is no admin") - return responseMessage{ - Status: fiber.StatusForbidden, - } + a.Status = fiber.StatusForbidden // -1 can't be valid - } else if eventId := args.C.QueryInt("id", -1); eventId == -1 { - logger.Log().Msgf("event-delete failed: \"id\" is missing in query") + } else if eventId := a.C.QueryInt("eventID", -1); eventId == -1 { + logger.Log().Msgf("event-delete failed: \"eventID\" is missing in query") - return responseMessage{ - Status: fiber.StatusBadRequest, - } + a.Status = fiber.StatusBadRequest } else if err := events.Delete(eventId); err != nil { logger.Error().Msgf("event-delete failed: can't delete from database: %v", err) - return responseMessage{ - Status: fiber.StatusInternalServerError, - } + a.Status = fiber.StatusInternalServerError } else { - logger.Log().Msgf("deleted event with id %d", eventId) - - return responseMessage{} + logger.Log().Msgf("deleted event with eventID %d", eventId) } } diff --git a/backend/pkg/router/login.go b/backend/pkg/router/login.go index 02c0c0b..0b09cd7 100644 --- a/backend/pkg/router/login.go +++ b/backend/pkg/router/login.go @@ -8,33 +8,32 @@ import ( // handle welcome-messages from clients func handleWelcome(c *fiber.Ctx) error { + args := Handler{C: c} + logger.Debug().Msgf("HTTP %s request: %q", c.Method(), c.OriginalURL()) - response := responseMessage{} - response.Data = UserChecked{ + args.Data = UserChecked{ Admin: false, } - args := HandlerArgs{C: c} - if loggedIn, err := args.checkUser(); err != nil { - response.Status = fiber.StatusInternalServerError + args.Status = fiber.StatusInternalServerError logger.Warn().Msgf("can't check user: %v", err) } else if !loggedIn { - response.Status = fiber.StatusUnauthorized + args.Status = fiber.StatusUnauthorized logger.Debug().Msgf("user not authorized") } else { - response.Data = UserChecked{ - UserName: args.User.UserName, - Admin: args.User.Admin, + args.Data = UserChecked{ + UserName: args.UserName, + Admin: args.Admin, } - logger.Debug().Msgf("welcomed user %q", args.User.UserName) + logger.Debug().Msgf("welcomed user %q", args.UserName) } - return response.send(c) + return args.send(c) } const messageWrongLogin = "Unkown user or wrong password" @@ -42,7 +41,7 @@ const messageWrongLogin = "Unkown user or wrong password" func handleLogin(c *fiber.Ctx) error { logger.Debug().Msgf("HTTP %s request: %q", c.Method(), c.OriginalURL()) - args := HandlerArgs{C: c} + args := Handler{C: c} // extract username and password from the request requestBody := struct { @@ -50,12 +49,10 @@ func handleLogin(c *fiber.Ctx) error { Password string `json:"password" validate:"required"` }{} - var response responseMessage - if err := args.C.BodyParser(&requestBody); err != nil { logger.Debug().Msgf("can't parse login-body: %v", err) - response.Status = fiber.StatusBadRequest + args.Status = fiber.StatusBadRequest // validate the body } else if err := validate.Struct(requestBody); err != nil { @@ -63,29 +60,29 @@ func handleLogin(c *fiber.Ctx) error { } else { // query the database for the user var result userDB - if err := db.DB.QueryRowx("SELECT password, admin, tokenID FROM USERS WHERE name = ?", requestBody.Username).StructScan(&result); err != nil { - response.Status = fiber.StatusForbidden - response.Message = messageWrongLogin + if err := db.DB.QueryRowx("SELECT password, admin, tokenID FROM USERS WHERE userName = ?", requestBody.Username).StructScan(&result); err != nil { + args.Status = fiber.StatusForbidden + args.Message = messageWrongLogin - logger.Info().Msgf("can't get user with name = %q from database", requestBody.Username) + logger.Info().Msgf("can't get user with userName = %q from database", requestBody.Username) } else { // hash the password if bcrypt.CompareHashAndPassword(result.Password, []byte(requestBody.Password)) != nil { - response.Status = fiber.StatusForbidden + args.Status = fiber.StatusForbidden - logger.Info().Msgf("login denied: wrong password for user with name = %q", requestBody.Username) + logger.Info().Msgf("login denied: wrong password for user with userName = %q", requestBody.Username) } else { // password is correct -> generate the JWT if jwt, err := config.SignJWT(JWTPayload{ UserName: requestBody.Username, TokenID: result.TokenID, }); err != nil { - response.Status = fiber.StatusInternalServerError + args.Status = fiber.StatusInternalServerError logger.Error().Msgf("can't create JWT: %v", err) } else { args.setSessionCookie(&jwt) - response.Data = UserChecked{ + args.Data = UserChecked{ UserName: requestBody.Username, Admin: true, } @@ -96,18 +93,18 @@ func handleLogin(c *fiber.Ctx) error { } } - return response.send(args.C) + return args.send(args.C) } // handles logout-requests func handleLogout(c *fiber.Ctx) error { logger.Debug().Msgf("HTTP %s request: %q", c.Method(), c.OriginalURL()) - args := HandlerArgs{ + args := Handler{ C: c, } args.removeSessionCookie() - return responseMessage{}.send(c) + return args.send(c) } diff --git a/backend/pkg/router/router.go b/backend/pkg/router/router.go index ffd8de2..1a67414 100644 --- a/backend/pkg/router/router.go +++ b/backend/pkg/router/router.go @@ -27,32 +27,33 @@ type responseMessage struct { } // answer the client request with the response-message -func (result responseMessage) send(c *fiber.Ctx) error { +func (a *Handler) send(c *fiber.Ctx) error { // if the status-code is in the error-region, return an error - if result.Status >= 400 { + if a.Status >= 400 { // if available, include the message - if result.Message != "" { - return fiber.NewError(result.Status, result.Message) + if a.Message != "" { + return fiber.NewError(a.Status, a.Message) } else { - return fiber.NewError(result.Status) + return fiber.NewError(a.Status) } } else { // if there is data, send it as JSON - if result.Data != nil { - c.JSON(result.Data) + if a.Data != nil { + c.JSON(a.Data) // if there is a message, send it instead - } else if result.Message != "" { - c.SendString(result.Message) + } else if a.Message != "" { + c.SendString(a.Message) } - return c.SendStatus(result.Status) + return c.SendStatus(a.Status) } } -type HandlerArgs struct { - C *fiber.Ctx - User UserChecked +type Handler struct { + C *fiber.Ctx + UserChecked + responseMessage } func init() { @@ -74,35 +75,45 @@ func init() { } // map with the individual registered endpoints - endpoints := map[string]map[string]func(HandlerArgs) responseMessage{ + endpoints := map[string]map[string]func(*Handler){ "GET": { - "events/assignments": getEventsAssignments, - "events/availabilities": getEventsAvailabilities, - "events/user/pending": getEventsUserPending, - "tasks": getTasks, - "users": getUsers, - "availabilities": getAvailabilities, + // all events with the task-assignments + "events/assignments": (*Handler).getEventsAssignments, + + // all events with the availabilities of the individual users + "events/availabilities": (*Handler).getEventsAvailabilities, + + // events the user has to enter his availability for + "events/user/pending": (*Handler).getEventsUserPending, + + // number of events the user has to enter his availability for + "events/user/pending/count": (*Handler).getEventsUserPendingCount, + + "events/user/assigned": (*Handler).getEventsUserAssigned, + "tasks": (*Handler).getTasks, // all available tasks + "users": (*Handler).getUsers, // all users + "availabilities": (*Handler).getAvailabilities, // all available availabilities }, "POST": { - "events": postEvent, - "users": postUser, - "availabilities": postAvailability, - "tasks": postTask, + "events": (*Handler).postEvent, // create an event + "users": (*Handler).postUser, // add an user + "availabilities": (*Handler).postAvailability, // add an availability + "tasks": (*Handler).postTask, // add a task }, "PATCH": { - "users": patchUser, - "events": patchEvent, - "availabilities": patchAvailabilitiy, - "tasks": patchTask, + "users": (*Handler).patchUser, // modify an user + "events": (*Handler).patchEvent, // modify an event + "availabilities": (*Handler).patchAvailabilitiy, // modify an availability + "tasks": (*Handler).patchTask, // modify a task }, "PUT": { - "users/password": putPassword, + "users/password": (*Handler).putPassword, // change the password }, "DELETE": { - "event": deleteEvent, - "tasks": deleteTask, - "availabilities": deleteAvailability, - "users": deleteUser, + "event": (*Handler).deleteEvent, // remove an event + "tasks": (*Handler).deleteTask, // remove a task + "availabilities": (*Handler).deleteAvailability, // remove an availability + "users": (*Handler).deleteUser, // remove an user }, } @@ -117,28 +128,23 @@ func init() { handleMethods[method]("/api/"+address, func(c *fiber.Ctx) error { logger.Debug().Msgf("HTTP %s request: %q", c.Method(), c.OriginalURL()) - var response responseMessage - args := HandlerArgs{ + args := Handler{ C: c, } if loggedIn, err := args.checkUser(); err != nil { - response = responseMessage{ - Status: fiber.StatusBadRequest, - } + args.Status = fiber.StatusBadRequest logger.Error().Msgf("can't check user: %v", err) } else if !loggedIn { - response = responseMessage{ - Status: fiber.StatusUnauthorized, - } + args.Status = fiber.StatusUnauthorized logger.Log().Msgf("user not authorized") - } else { - response = handler(args) } - return response.send(c) + handler(&args) + + return args.send(c) }) } } @@ -151,7 +157,7 @@ func Listen() { fmt.Println(err) } -func (args HandlerArgs) setSessionCookie(jwt *string) { +func (args Handler) setSessionCookie(jwt *string) { var value string if jwt == nil { @@ -170,7 +176,7 @@ func (args HandlerArgs) setSessionCookie(jwt *string) { } // removes the session-coockie from a request -func (args HandlerArgs) removeSessionCookie() { +func (args Handler) removeSessionCookie() { args.C.Cookie(&fiber.Cookie{ Name: "session", Value: "", @@ -233,7 +239,7 @@ type UserChecked struct { } // checks wether the request is from a valid user -func (args *HandlerArgs) checkUser() (bool, error) { +func (args *Handler) checkUser() (bool, error) { userName, tokenID, err := extractJWT(args.C) if err != nil { @@ -246,7 +252,7 @@ func (args *HandlerArgs) checkUser() (bool, error) { } // retrieve the user from the database - if err := db.DB.Get(&dbResult, "SELECT tokenID, admin FROM USERS WHERE name = ?", userName); err != nil { + if err := db.DB.Get(&dbResult, "SELECT tokenID, admin FROM USERS WHERE userName = ?", userName); err != nil { return false, err // if the tokenID is valid, the user is authorized @@ -256,11 +262,9 @@ func (args *HandlerArgs) checkUser() (bool, error) { // reset the expiration of the cookie args.setSessionCookie(nil) - args.User = UserChecked{ - UserName: userName, - Admin: dbResult.Admin, - } - return true, nil - + args.UserName = userName + args.Admin = dbResult.Admin } + return true, nil + } diff --git a/backend/pkg/router/tasks.go b/backend/pkg/router/tasks.go index dd6865c..3db8b7c 100644 --- a/backend/pkg/router/tasks.go +++ b/backend/pkg/router/tasks.go @@ -5,125 +5,93 @@ import ( "github.com/johannesbuehl/golunteer/backend/pkg/db/tasks" ) -func getTasks(args HandlerArgs) responseMessage { +func (a *Handler) getTasks() { if taskSlice, err := tasks.GetSlice(); err != nil { logger.Error().Msgf("can't get tasks: %v", err) - return responseMessage{ - Status: fiber.StatusInternalServerError, - } + a.Status = fiber.StatusInternalServerError } else { - return responseMessage{ - Data: taskSlice, - } + a.Data = taskSlice } } -func postTask(args HandlerArgs) responseMessage { +func (a *Handler) postTask() { // check admin - if !args.User.Admin { + if !a.Admin { logger.Log().Msgf("user is not admin") - return responseMessage{ - Status: fiber.StatusUnauthorized, - } + a.Status = fiber.StatusUnauthorized } else { // parse the body var task tasks.Task - if err := args.C.BodyParser(&task); err != nil { + if err := a.C.BodyParser(&task); err != nil { logger.Log().Msgf("can't parse body: %v", err) - return responseMessage{ - Status: fiber.StatusBadRequest, - } + a.Status = fiber.StatusBadRequest // validate the body } else if err := validate.Struct(&task); err != nil { logger.Log().Msgf("invalid body: %v", err) - return responseMessage{ - Status: fiber.StatusBadRequest, - } + a.Status = fiber.StatusBadRequest // insert the task into the database } else if err := tasks.Add(task); err != nil { logger.Error().Msgf("can't add task: %v", err) - return responseMessage{ - Status: fiber.StatusInternalServerError, - } - } else { - return responseMessage{} + a.Status = fiber.StatusInternalServerError } } } -func patchTask(args HandlerArgs) responseMessage { +func (a *Handler) patchTask() { // check admin - if !args.User.Admin { + if !a.Admin { logger.Log().Msgf("user is not admin") - return responseMessage{ - Status: fiber.StatusUnauthorized, - } + a.Status = fiber.StatusUnauthorized } else { // parse the body var task tasks.TaskDB - if err := args.C.BodyParser(&task); err != nil { + if err := a.C.BodyParser(&task); err != nil { logger.Log().Msgf("can't parse body: %v", err) - return responseMessage{ - Status: fiber.StatusBadRequest, - } + a.Status = fiber.StatusBadRequest // validate the body } else if err := validate.Struct(&task); err != nil { logger.Log().Msgf("invalid body: %v", err) - return responseMessage{ - Status: fiber.StatusBadRequest, - } + a.Status = fiber.StatusBadRequest // insert the task into the database } else if err := tasks.Update(task); err != nil { logger.Error().Msgf("can't update task: %v", err) - return responseMessage{ - Status: fiber.StatusInternalServerError, - } - } else { - return responseMessage{} + a.Status = fiber.StatusInternalServerError } } } -func deleteTask(args HandlerArgs) responseMessage { +func (a *Handler) deleteTask() { // check admin - if !args.User.Admin { + if !a.Admin { logger.Warn().Msg("task-deletion failed: user is no admin") - return responseMessage{ - Status: fiber.StatusUnauthorized, - } + a.Status = fiber.StatusUnauthorized // parse the query - } else if taskID := args.C.QueryInt("id", -1); taskID == -1 { - logger.Log().Msg("task-deletion failed: invalid query: doesn't include \"id\"") + } else if taskID := a.C.QueryInt("taskID", -1); taskID == -1 { + logger.Log().Msg("task-deletion failed: invalid query: doesn't include \"taskID\"") - return responseMessage{ - Status: fiber.StatusBadRequest, - } + a.Status = fiber.StatusBadRequest // delete the task from the database } else if err := tasks.Delete(taskID); err != nil { logger.Error().Msgf("task-deletion failed: can't delete task from database: %v", err) - return responseMessage{ - Status: fiber.StatusInternalServerError, - } - } else { - return responseMessage{} + a.Status = fiber.StatusInternalServerError } } diff --git a/backend/pkg/router/user.go b/backend/pkg/router/user.go index 7c620b6..83c247d 100644 --- a/backend/pkg/router/user.go +++ b/backend/pkg/router/user.go @@ -5,76 +5,75 @@ import ( "github.com/johannesbuehl/golunteer/backend/pkg/db/users" ) -func getUsers(args HandlerArgs) responseMessage { - response := responseMessage{} - +func (a *Handler) getUsers() { // check admin - if !args.User.Admin { - response.Status = fiber.StatusForbidden + if !a.Admin { + a.Status = fiber.StatusForbidden logger.Log().Msgf("user is no admin") } else if users, err := users.Get(); err != nil { - response.Status = fiber.StatusInternalServerError + a.Status = fiber.StatusInternalServerError logger.Error().Msgf("can't get users: %v", err) } else { - response.Data = users + a.Data = users } - - return response } -func postUser(args HandlerArgs) responseMessage { - response := responseMessage{} +func (a *Handler) postUser() { // check admin - if !args.User.Admin { - response.Status = fiber.StatusForbidden + if !a.Admin { + a.Status = fiber.StatusForbidden + + logger.Log().Msgf("user is no admin") } else { // parse the body var body users.UserAdd - if err := args.C.BodyParser(&body); err != nil { - response.Status = fiber.StatusBadRequest + if err := a.C.BodyParser(&body); err != nil { + a.Status = fiber.StatusBadRequest logger.Warn().Msgf("can't parse body: %v", err) // validate the body } else if err := validate.Struct(body); err != nil { - response.Status = fiber.StatusBadRequest + a.Status = fiber.StatusBadRequest logger.Warn().Msgf("invalid body: %v", err) } else if err := users.Add(body); err != nil { - response.Status = fiber.StatusInternalServerError + a.Status = fiber.StatusInternalServerError logger.Warn().Msgf("can't add user: %v", err) } } - - return response } -func putPassword(args HandlerArgs) responseMessage { - response := responseMessage{} +func (a *Handler) putPassword() { // parse the body var body users.UserChangePassword - if err := args.C.BodyParser(&body); err != nil { - response.Status = fiber.StatusBadRequest - + if err := a.C.BodyParser(&body); err != nil { logger.Log().Msgf("can't parse body: %v", err) + + a.Status = fiber.StatusBadRequest + + // body has been parsed successfully } else { - body.UserName = args.User.UserName + body.UserName = a.UserName + // validate the body if err := validate.Struct(body); err != nil { - response.Status = fiber.StatusBadRequest - logger.Info().Msgf("invalid body: %v", err) - } else if tokenID, err := users.ChangePassword(body); err != nil { - response.Status = fiber.StatusInternalServerError + a.Status = fiber.StatusBadRequest + + // send the password change to the database and get the new tokenID back + } else if tokenID, err := users.ChangePassword(body); err != nil { logger.Error().Msgf("can't update password: %v", err) + a.Status = fiber.StatusInternalServerError + // sign a new JWT with the new tokenID } else if jwt, err := config.SignJWT(JWTPayload{ UserName: body.UserName, @@ -82,23 +81,22 @@ func putPassword(args HandlerArgs) responseMessage { // if something failed, remove the current session-cookie }); err != nil { - args.removeSessionCookie() + a.removeSessionCookie() + + a.Status = fiber.StatusPartialContent // set the new session-cookie } else { // update the token in the session-cookie - args.setSessionCookie(&jwt) + a.setSessionCookie(&jwt) } } - - return response } -func patchUser(args HandlerArgs) responseMessage { - response := responseMessage{} +func (a *Handler) patchUser() { // check admin - if !args.User.Admin { - response.Status = fiber.StatusForbidden + if !a.Admin { + a.Status = fiber.StatusForbidden logger.Log().Msgf("user is no admin") } else { @@ -108,20 +106,20 @@ func patchUser(args HandlerArgs) responseMessage { NewName string `json:"newName"` } - if err := args.C.BodyParser(&body); err != nil { - response.Status = fiber.StatusBadRequest + if err := a.C.BodyParser(&body); err != nil { + a.Status = fiber.StatusBadRequest logger.Log().Msgf("can't parse body: %v", err) // prevent to demoting self from admin - } else if !body.Admin && body.UserName == args.User.UserName { - response.Status = fiber.StatusBadRequest + } else if !body.Admin && body.UserName == a.UserName { + a.Status = fiber.StatusBadRequest logger.Warn().Msgf("can't demote self from admin") } else { // check for an empty user-name if len(body.UserName) == 0 { - response.Status = fiber.StatusBadRequest + a.Status = fiber.StatusBadRequest logger.Warn().Msgf("username is empty") @@ -135,36 +133,36 @@ func patchUser(args HandlerArgs) responseMessage { } if _, err = users.ChangePassword(usePasswordChange); err != nil { - response.Status = fiber.StatusInternalServerError + a.Status = fiber.StatusInternalServerError logger.Error().Msgf("can't change password: %v", err) - return response + return } } // only change the name, if it differs if body.NewName != body.UserName { if err := users.ChangeName(body.UserName, body.NewName); err != nil { - response.Status = fiber.StatusInternalServerError + a.Status = fiber.StatusInternalServerError logger.Error().Msgf("can't change user-name: %v", err) - return response + return } } // set the admin-status if err := users.SetAdmin(body.NewName, body.Admin); err != nil { - response.Status = fiber.StatusInternalServerError + a.Status = fiber.StatusInternalServerError logger.Error().Msgf("updating admin-status failed: %v", err) } else { // if we modified ourself, update the session-cookie - if body.UserName == args.User.UserName { + if body.UserName == a.UserName { // get the tokenID if tokenID, err := users.TokenID(body.NewName); err != nil { - response.Status = fiber.StatusInternalServerError + a.Status = fiber.StatusInternalServerError logger.Error().Msgf("can't get tokenID: %v", err) @@ -172,65 +170,51 @@ func patchUser(args HandlerArgs) responseMessage { UserName: body.NewName, TokenID: tokenID, }); err != nil { - response.Status = fiber.StatusInternalServerError + a.Status = fiber.StatusInternalServerError logger.Error().Msgf("JWT-signing failed: %v", err) // remove the session-cookie - args.removeSessionCookie() + a.removeSessionCookie() } else { - args.setSessionCookie(&jwt) + a.setSessionCookie(&jwt) } } } } } } - - return response } -func deleteUser(args HandlerArgs) responseMessage { +func (a *Handler) deleteUser() { // check admin - if !args.User.Admin { + if !a.Admin { logger.Warn().Msg("user-deletion failed: user is no admin") - return responseMessage{ - Status: fiber.StatusUnauthorized, - } + a.Status = fiber.StatusUnauthorized // get the username from the query - } else if userName := args.C.Query("userName"); userName == "" { + } else if userName := a.C.Query("userName"); userName == "" { logger.Log().Msg("user-deletion failed: query is missing \"userName\"") - return responseMessage{ - Status: fiber.StatusBadRequest, - } + a.Status = fiber.StatusBadRequest // check wether the user tries to delete himself - } else if userName == args.User.UserName { + } else if userName == a.UserName { logger.Log().Msg("user-deletion failed: self-deletion is illegal") - return responseMessage{ - Status: fiber.StatusBadRequest, - } + a.Status = fiber.StatusBadRequest // check wether the user tries to delete the admin } else if userName == "admin" { logger.Log().Msg("user-deletion failed: admin-deletion is illegal") - return responseMessage{ - Status: fiber.StatusBadRequest, - } + a.Status = fiber.StatusBadRequest // delete the user } else if err := users.Delete(userName); err != nil { logger.Error().Msgf("user-deletion failed: user doesn't exist") - return responseMessage{ - Status: fiber.StatusNotFound, - } - } else { - return responseMessage{} + a.Status = fiber.StatusNotFound } } diff --git a/backend/setup.sql b/backend/setup.sql index 4b6745c..d66c05a 100644 --- a/backend/setup.sql +++ b/backend/setup.sql @@ -1,18 +1,18 @@ CREATE TABLE IF NOT EXISTS TASKS ( - id INTEGER PRIMARY KEY, - name varchar(64) NOT NULL, + taskID INTEGER PRIMARY KEY, + taskName varchar(64) NOT NULL, enabled BOOL DEFAULT 1 ); CREATE TABLE IF NOT EXISTS AVAILABILITIES ( - id INTEGER PRIMARY KEY, - name varchar(32) NOT NULL, + availabilityID INTEGER PRIMARY KEY, + availabilityName varchar(32) NOT NULL, color varchar(7) NOT NULL, enabled BOOL DEFAULT 1 ); CREATE TABLE IF NOT EXISTS USERS ( - name varchar(64) PRIMARY KEY, + userName varchar(64) PRIMARY KEY, password BLOB NOT NULL, admin BOOL NOT NULL DEFAULT(false), tokenID varchar(64) NOT NULL, @@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS USERS ( ); CREATE TABLE IF NOT EXISTS EVENTS ( - id INTEGER PRIMARY KEY, + eventID INTEGER PRIMARY KEY, date DATETIME NOT NULL, description TEXT DEFAULT "" ); @@ -31,9 +31,9 @@ CREATE TABLE IF NOT EXISTS USER_AVAILABILITIES ( eventID INTEGER NOT NULL, availabilityID INTEGER NOT NULL, PRIMARY KEY (userName, eventID), - FOREIGN KEY (userName) REFERENCES USERS(name) ON DELETE CASCADE ON UPDATE CASCADE, - FOREIGN KEY (eventID) REFERENCES EVENTS(id) ON DELETE CASCADE ON UPDATE CASCADE, - FOREIGN KEY (availabilityID) REFERENCES AVAILABILITIES(id) ON UPDATE CASCADE + FOREIGN KEY (userName) REFERENCES USERS(userName) ON DELETE CASCADE ON UPDATE CASCADE, + FOREIGN KEY (eventID) REFERENCES EVENTS(eventID) ON DELETE CASCADE ON UPDATE CASCADE, + FOREIGN KEY (availabilityID) REFERENCES AVAILABILITIES(availabilityID) ON UPDATE CASCADE ); CREATE TABLE IF NOT EXISTS USER_ASSIGNMENTS ( @@ -41,7 +41,7 @@ CREATE TABLE IF NOT EXISTS USER_ASSIGNMENTS ( taskID INTEGER NOT NULL, userName varchar(64), PRIMARY KEY (eventID, taskID), - FOREIGN KEY (eventID) REFERENCES EVENTS(id) ON DELETE CASCADE, - FOREIGN KEY (userName) REFERENCES USERS(name) ON DELETE CASCADE ON UPDATE CASCADE, - FOREIGN KEY (taskID) REFERENCES TASKS(id) ON UPDATE CASCADE + FOREIGN KEY (eventID) REFERENCES EVENTS(eventID) ON DELETE CASCADE, + FOREIGN KEY (userName) REFERENCES USERS(userName) ON DELETE CASCADE ON UPDATE CASCADE, + FOREIGN KEY (taskID) REFERENCES TASKS(taskID) ON UPDATE CASCADE ); diff --git a/client/README.md b/client/README.md deleted file mode 100644 index e215bc4..0000000 --- a/client/README.md +++ /dev/null @@ -1,36 +0,0 @@ -This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app). - -## Getting Started - -First, run the development server: - -```bash -npm run dev -# or -yarn dev -# or -pnpm dev -# or -bun dev -``` - -Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. - -You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file. - -This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel. - -## Learn More - -To learn more about Next.js, take a look at the following resources: - -- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API. -- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial. - -You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome! - -## Deploy on Vercel - -The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js. - -Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details. diff --git a/client/src/Zustand.ts b/client/src/Zustand.ts index 8fdc01f..8690054 100644 --- a/client/src/Zustand.ts +++ b/client/src/Zustand.ts @@ -1,17 +1,19 @@ "use client"; import { create } from "zustand"; -import { persist } from "zustand/middleware"; import { Task } from "./lib"; import { Availability } from "./app/admin/(availabilities)/AvailabilityEditor"; -export interface EventData { - id: number; +export interface BaseEvent { + eventID: number; date: string; - tasks: TaskAssignment[]; description: string; } +export type EventData = BaseEvent & { + tasks: TaskAssignment[]; +}; + interface TaskAssignment { taskID: number; taskName: string; @@ -40,28 +42,27 @@ const initialState = { }; const zustand = create()( - persist( - (set, get) => ({ - ...initialState, - reset: (newZustand) => { - console.debug("reset"); - set({ - ...initialState, - ...newZustand, - }); - }, - patch: (patch) => set({ ...get(), ...patch }), - }), - { - name: "golunteer-storage", - partialize: (state) => - Object.fromEntries( - Object.entries(state).filter(([key]) => - ["user", "tasksList", "tasksMap"].includes(key), - ), - ), + // persist( + (set, get) => ({ + ...initialState, + reset: (newZustand) => { + set({ + ...initialState, + ...newZustand, + }); }, - ), + patch: (patch) => set({ ...get(), ...patch }), + }), + // { + // name: "golunteer-storage", + // partialize: (state) => + // Object.fromEntries( + // Object.entries(state).filter(([key]) => + // ["user", "tasksList", "tasksMap"].includes(key), + // ), + // ), + // }, + // ), ); export default zustand; diff --git a/client/src/app/Header.tsx b/client/src/app/Header.tsx index 15f1811..d62612e 100644 --- a/client/src/app/Header.tsx +++ b/client/src/app/Header.tsx @@ -30,10 +30,7 @@ export default function Header({ sites }: { sites: SiteLink[] }) { useEffect(() => { (async () => { - const result = await apiCall<{ pendingEvents: number }>( - "GET", - "events/user/pending", - ); + const result = await apiCall("GET", "events/user/pending/count"); if (result.ok) { setPendingEvents(await result.json()); diff --git a/client/src/app/MyEvents.tsx b/client/src/app/MyEvents.tsx new file mode 100644 index 0000000..13c6e48 --- /dev/null +++ b/client/src/app/MyEvents.tsx @@ -0,0 +1,29 @@ +"use client"; + +import { apiCall } from "@/lib"; +import { EventData } from "@/Zustand"; +import { useAsyncList } from "@react-stately/data"; + +export default function MyEvents() { + const events = useAsyncList({ + async load() { + const result = await apiCall("GET", "events/user/assigned"); + + if (result.ok) { + return { + items: await result.json(), + }; + } else { + return { + items: [], + }; + } + }, + }); + + return ( +
+

{events.items.map((e) => e.date)}

+
+ ); +} diff --git a/client/src/app/Overview.tsx b/client/src/app/Overview.tsx index fe4a12d..17fec71 100644 --- a/client/src/app/Overview.tsx +++ b/client/src/app/Overview.tsx @@ -1,33 +1,17 @@ -"use client"; - -import { Add } from "@carbon/icons-react"; -import { useState } from "react"; -import AddEvent from "../components/Event/AddEvent"; -import { Button } from "@heroui/react"; - -export default function EventVolunteer() { - const [showAddItemDialogue, setShowAddItemDialogue] = useState(false); +import MyEvents from "./MyEvents"; +import PengingEvents from "./PendingEvents"; +export default function Overview() { return (
-

Overview

- - - +

My Events

+ +

+ events that I don't have entered an availability yet +

+
); } diff --git a/client/src/app/PendingEvents.tsx b/client/src/app/PendingEvents.tsx new file mode 100644 index 0000000..ceaf47e --- /dev/null +++ b/client/src/app/PendingEvents.tsx @@ -0,0 +1,77 @@ +"use client"; + +import AvailabilityChip from "@/components/AvailabilityChip"; +import Event from "@/components/Event/Event"; +import { apiCall, getAvailabilities } from "@/lib"; +import { BaseEvent } from "@/Zustand"; +import { Select, SelectItem } from "@heroui/react"; +import { useAsyncList } from "@react-stately/data"; + +type EventAvailability = BaseEvent & { + availability: number; +}; + +export default function PengingEvents() { + // get the events the user hasn't yet inserted his availability for + const events = useAsyncList({ + async load() { + const result = await apiCall( + "GET", + "events/user/pending", + ); + + if (result.ok) { + return { + items: await result.json(), + }; + } else { + return { + items: [], + }; + } + }, + }); + + // the individual, selectable availabilities + const availabilities = useAsyncList({ + async load() { + return { + items: (await getAvailabilities()).filter((a) => a.enabled), + }; + }, + }); + + return ( +
+ {events.items.map((e) => ( + + + + ))} +
+ ); +} diff --git a/client/src/app/admin/(availabilities)/Availabilities.tsx b/client/src/app/admin/(availabilities)/Availabilities.tsx index f73aea5..747b064 100644 --- a/client/src/app/admin/(availabilities)/Availabilities.tsx +++ b/client/src/app/admin/(availabilities)/Availabilities.tsx @@ -40,7 +40,7 @@ export default function Availabilities() { switch (sortDescriptor.column) { case "text": - cmp = a.name.localeCompare(b.name); + cmp = a.availabilityName.localeCompare(b.availabilityName); break; case "enabled": if (a.enabled && !b.enabled) { @@ -78,9 +78,11 @@ export default function Availabilities() { availabilities.reload(); } - async function sendDeleteAvailability(id: number | undefined) { - if (id !== undefined) { - const result = await apiCall("DELETE", "availabilities", { id }); + async function sendDeleteAvailability(availabilityID: number | undefined) { + if (availabilityID !== undefined) { + const result = await apiCall("DELETE", "availabilities", { + availabilityID, + }); if (result.ok) { reload(); @@ -133,7 +135,7 @@ export default function Availabilities() { {(availability) => ( - + @@ -190,7 +192,9 @@ export default function Availabilities() { !isOpen ? setDeleteAvailability(undefined) : null } itemName="Availability" - onDelete={() => sendDeleteAvailability(deleteAvailability?.id)} + onDelete={() => + sendDeleteAvailability(deleteAvailability?.availabilityID) + } > {!!deleteAvailability ? ( <> diff --git a/client/src/app/admin/(availabilities)/AvailabilityEditor.tsx b/client/src/app/admin/(availabilities)/AvailabilityEditor.tsx index 83bdf76..7f4dc2f 100644 --- a/client/src/app/admin/(availabilities)/AvailabilityEditor.tsx +++ b/client/src/app/admin/(availabilities)/AvailabilityEditor.tsx @@ -1,4 +1,5 @@ import ColorSelector from "@/components/Colorselector"; +import { AllString } from "@/lib"; import { Checkbox, Form, @@ -12,9 +13,9 @@ import { import React, { FormEvent, useEffect, useState } from "react"; export interface Availability { - name: string; + availabilityName: string; color: string; - id: number | undefined; + availabilityID: number | undefined; enabled: boolean; } @@ -26,7 +27,7 @@ export default function AvailabilityEditor(props: { onOpenChange?: (isOpen: boolean) => void; onSubmit?: (e: Availability) => void; }) { - const [name, setName] = useState(props.value?.name ?? ""); + const [name, setName] = useState(props.value?.availabilityName ?? ""); const [color, setColor] = useState(props.value?.color ?? "Red"); const [enabled, setEnabled] = useState(props.value?.enabled ?? true); @@ -40,15 +41,13 @@ export default function AvailabilityEditor(props: { }, [props.isOpen]); function submit(e: FormEvent) { - const formData = Object.fromEntries(new FormData(e.currentTarget)) as { - name: string; - color: string; - enabled: string; - }; + const formData = Object.fromEntries( + new FormData(e.currentTarget), + ) as AllString>; props.onSubmit?.({ ...formData, - id: props.value?.id, + availabilityID: props.value?.availabilityID, enabled: formData.enabled == "true", }); } @@ -77,7 +76,7 @@ export default function AvailabilityEditor(props: { Edit Availability{" "} diff --git a/client/src/app/admin/(tasks)/EditTask.tsx b/client/src/app/admin/(tasks)/EditTask.tsx index 97c3565..9adc599 100644 --- a/client/src/app/admin/(tasks)/EditTask.tsx +++ b/client/src/app/admin/(tasks)/EditTask.tsx @@ -20,12 +20,12 @@ export default function EditTask(props: { return ( Edit Task{" "} - "{props.value?.name}" + "{props.value?.taskName}" } diff --git a/client/src/app/admin/(tasks)/TaskEditor.tsx b/client/src/app/admin/(tasks)/TaskEditor.tsx index e7a7a0c..0d6be29 100644 --- a/client/src/app/admin/(tasks)/TaskEditor.tsx +++ b/client/src/app/admin/(tasks)/TaskEditor.tsx @@ -1,4 +1,4 @@ -import { Task } from "@/lib"; +import { AllString, Task } from "@/lib"; import { Checkbox, Form, @@ -19,7 +19,7 @@ export default function TaskEditor(props: { onOpenChange?: (isOpen: boolean) => void; onSubmit?: (e: Task) => void; }) { - const [name, setName] = useState(props.value?.name ?? ""); + const [name, setName] = useState(props.value?.taskName ?? ""); const [enabled, setEnabled] = useState(props.value?.enabled ?? true); // clear the inputs on closing @@ -31,14 +31,13 @@ export default function TaskEditor(props: { }, [props.isOpen]); function submit(e: FormEvent) { - const formData = Object.fromEntries(new FormData(e.currentTarget)) as { - name: string; - enabled: string; - }; + const formData = Object.fromEntries( + new FormData(e.currentTarget), + ) as AllString>; props.onSubmit?.({ ...formData, - id: props.value?.id, + taskID: props.value?.taskID, enabled: formData.enabled == "true", }); } @@ -68,7 +67,7 @@ export default function TaskEditor(props: { {(task) => ( - - {task.name} + + {task.taskName} @@ -181,13 +181,13 @@ export default function Tasks() { isOpen={!!deleteTask} onOpenChange={(isOpen) => (!isOpen ? setDeleteTask(undefined) : null)} itemName="Task" - onDelete={() => sendDeleteTask(deleteTask?.id)} + onDelete={() => sendDeleteTask(deleteTask?.taskID)} > {!!deleteTask ? ( <> The task{" "} - {deleteTask.name} + {deleteTask.taskName} {" "} will be deleted. diff --git a/client/src/app/admin/(users)/UserEditor.tsx b/client/src/app/admin/(users)/UserEditor.tsx index 872dbc3..118a5c2 100644 --- a/client/src/app/admin/(users)/UserEditor.tsx +++ b/client/src/app/admin/(users)/UserEditor.tsx @@ -1,4 +1,8 @@ -import { classNames, validatePassword as validatePassword } from "@/lib"; +import { + AllString, + classNames, + validatePassword as validatePassword, +} from "@/lib"; import zustand, { User, UserAddModify } from "@/Zustand"; import { Checkbox, @@ -29,11 +33,9 @@ export default function UserEditor(props: { // update the user in the backend async function submit(e: FormEvent) { - const formData = Object.fromEntries(new FormData(e.currentTarget)) as { - userName: string; - password: string; - admin: string; - }; + const formData = Object.fromEntries( + new FormData(e.currentTarget), + ) as AllString; const data = { ...formData, diff --git a/client/src/app/assignments/page.tsx b/client/src/app/assignments/page.tsx index e92505c..408dd5c 100644 --- a/client/src/app/assignments/page.tsx +++ b/client/src/app/assignments/page.tsx @@ -62,8 +62,8 @@ export default function AdminPanel() { ...tasks .filter((task) => task.enabled) .map((task) => ({ - label: task.name, - key: task.id ?? -1, + label: task.taskName, + key: task.taskID ?? -1, align: "center", })), { key: "actions", label: "Action", align: "center" }, @@ -116,7 +116,9 @@ export default function AdminPanel() { // send a delete request to the backend and close the popup on success async function sendDeleteEvent() { if (deleteEvent !== undefined) { - const result = await apiCall("DELETE", "event", { id: deleteEvent.id }); + const result = await apiCall("DELETE", "event", { + eventID: deleteEvent.eventID, + }); if (result.ok) { // store the received events @@ -262,7 +264,7 @@ export default function AdminPanel() { {(event) => ( - + {(columnKey) => ( {getKeyValue(event, columnKey)} )} diff --git a/client/src/app/events/page.tsx b/client/src/app/events/page.tsx index 8dda70e..f7685c4 100644 --- a/client/src/app/events/page.tsx +++ b/client/src/app/events/page.tsx @@ -15,13 +15,11 @@ export default function Events() { const events = useAsyncList({ async load() { - const result = await apiCall("GET", "events/assignments"); + const result = await apiCall("GET", "events/assignments"); if (result.ok) { const data = await result.json(); - console.debug(data); - return { items: data, }; @@ -62,6 +60,7 @@ export default function Events() { className="border-2 border-accent-3" isOpen={showAddItemDialogue} onOpenChange={setShowAddItemDialogue} + onSuccess={events.reload} /> ) : null} diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx index ef17c6f..d71ff59 100644 --- a/client/src/app/page.tsx +++ b/client/src/app/page.tsx @@ -1,5 +1,5 @@ -import EventVolunteer from "./Overview"; +import Overview from "./Overview"; export default function Home() { - return ; + return ; } diff --git a/client/src/components/AvailabilityChip.tsx b/client/src/components/AvailabilityChip.tsx index 6b19b09..7851c50 100644 --- a/client/src/components/AvailabilityChip.tsx +++ b/client/src/components/AvailabilityChip.tsx @@ -17,7 +17,7 @@ export default function AvailabilityChip({ }} className={className} > - {availability.name} + {availability.availabilityName} ); } diff --git a/client/src/components/Event/EditEvent.tsx b/client/src/components/Event/EditEvent.tsx index feab647..36aa4a0 100644 --- a/client/src/components/Event/EditEvent.tsx +++ b/client/src/components/Event/EditEvent.tsx @@ -24,7 +24,7 @@ export default function EditEvent(props: { return ( ( props.value?.tasks.map((k) => k.taskID.toString()) ?? [], ); - const tasks = zustand((state) => state.tasks); + + const tasks = useAsyncList({ + async load() { + return { + items: await getTasks(), + }; + }, + }); function onSubmit() { if (!!props.onSubmit && !!date) { props.onSubmit({ - id: props.value?.id ?? -1, + eventID: props.value?.eventID ?? -1, date: date.toAbsoluteString(), description, tasks: eventTasks.map((t) => parseInt(t)), @@ -109,12 +118,12 @@ export default function EventEditor(props: { } > {!!tasks ? ( - tasks + tasks.items ?.filter((task) => task.enabled) .map((task) => ( -
- - {task.name} +
+ + {task.taskName}
)) diff --git a/client/src/lib.ts b/client/src/lib.ts index 3c5bf7b..61b8b11 100644 --- a/client/src/lib.ts +++ b/client/src/lib.ts @@ -2,30 +2,32 @@ import { DateFormatter as IntlDateFormatter } from "@internationalized/date"; import zustand from "./Zustand"; import { Availability } from "./app/admin/(availabilities)/AvailabilityEditor"; +export type AllString = { [K in keyof T]: string }; + type QueryParams = Record; -export type APICallResult = Response & { +export type APICallResult = Omit & { json: () => Promise; }; -export async function apiCall( +export async function apiCall( method: "GET", api: string, query?: QueryParams, ): Promise>; -export async function apiCall( +export async function apiCall( method: "POST" | "PATCH" | "PUT", api: string, query?: QueryParams, body?: object, ): Promise>; -export async function apiCall( +export async function apiCall( method: "DELETE", api: string, query?: QueryParams, body?: object, ): Promise>; -export async function apiCall( +export async function apiCall( method: "GET" | "POST" | "PATCH" | "PUT" | "DELETE", api: string, query?: QueryParams, @@ -96,8 +98,8 @@ export function validatePassword(password: string): string[] { } export interface Task { - id: number | undefined; - name: string; + taskID: number | undefined; + taskName: string; enabled: boolean; } @@ -105,7 +107,7 @@ export async function getTask(name: string): Promise { // get the tasks const tasks = await getTasks(); - return tasks.find((t) => t.name === name); + return tasks.find((t) => t.taskName === name); } export async function getTasks(): Promise { @@ -136,7 +138,7 @@ export async function getAvailabilities(): Promise { if (!!state.availabilities) { return state.availabilities; } else { - const result = await apiCall("GET", "availabilities"); + const result = await apiCall("GET", "availabilities"); if (result.ok) { const tasks = await result.json();