From ba839a2e860bf52a172826642dddcb5ba220f5d1 Mon Sep 17 00:00:00 2001 From: Gonne Date: Sat, 21 Oct 2023 16:37:47 +0200 Subject: [PATCH 1/2] Korrigiere Reihenfolge, um Foreign Keys zu respektieren --- repositories/request.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repositories/request.go b/repositories/request.go index 4ff8c93..8dec68a 100644 --- a/repositories/request.go +++ b/repositories/request.go @@ -107,8 +107,8 @@ func (r *RequestRepo) Execute(request models.Request) error { _, err = r.db.Exec("UPDATE officeHour SET active=true WHERE id=?", request.OfficeHour.Id) r.db.Exec("DELETE FROM request WHERE officeHour=?", request.OfficeHour.Id) case models.RequestDelete: - err = r.officeHourRepo.Delete(request.OfficeHour) r.db.Exec("DELETE FROM request WHERE officeHour=?", request.OfficeHour.Id) + err = r.officeHourRepo.Delete(request.OfficeHour) default: log.Printf("Executing request: Action type %d unknown.", request.Action) _, err = r.db.Exec("DELETE FROM request WHERE id=?", request.Id) From e32d5023aa0b8e5fc73cc248273cfe1340cd1976 Mon Sep 17 00:00:00 2001 From: Gonne Date: Sat, 21 Oct 2023 16:55:01 +0200 Subject: [PATCH 2/2] Korrigiere Action Konstanten --- templating/templates/confirmationMail | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templating/templates/confirmationMail b/templating/templates/confirmationMail index 759fce4..80e1871 100644 --- a/templating/templates/confirmationMail +++ b/templating/templates/confirmationMail @@ -1,11 +1,11 @@ From: {{.Config.Mailer.FromName}} To: {{.Request.OfficeHour.Tutor.Email}} -Subject: Sprechstunde {{if eq .Request.Action 1}}anlegen{{end}}{{if eq .Request.Action 2}}löschen{{end}} +Subject: Sprechstunde {{if eq .Request.Action 0}}anlegen{{end}}{{if eq .Request.Action 1}}löschen{{end}} Message-Id: {{.MessageId}} Hallo {{.Request.OfficeHour.Tutor.Name}}, -mit deiner Emailadresse soll eine Sprechstunde mit folgenden Daten {{if eq .Request.Action 1}}angelegt werden{{end}}{{if eq .Request.Action 2}}gelöscht werden{{end}}: +mit deiner Emailadresse soll eine Sprechstunde mit folgenden Daten {{if eq .Request.Action 0}}angelegt werden{{end}}{{if eq .Request.Action 1}}gelöscht werden{{end}}: {{.Request.OfficeHour.Course.Name}} {{DayName .Request.OfficeHour.Date.Day}}