From 8651001bcecd3c04d935140e83752780f645d6de Mon Sep 17 00:00:00 2001
From: Martin Schmollinger <martin.schmollinger@reutlingen-university.de>
Date: Wed, 10 May 2023 17:39:30 +0200
Subject: [PATCH] Bug fixing
---
src/myaktion/db/db.go | 2 +-
src/myaktion/go.mod | 2 +-
src/myaktion/handler/campaign.go | 4 ++--
src/myaktion/handler/campaign_test.go | 6 +++---
src/myaktion/handler/donation.go | 4 ++--
src/myaktion/handler/health_test.go | 6 ++++--
src/myaktion/main.go | 6 +++---
src/myaktion/service/campaign.go | 4 ++--
src/myaktion/service/donation.go | 4 ++--
9 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/myaktion/db/db.go b/src/myaktion/db/db.go
index 2a5cf4d..cd79166 100644
--- a/src/myaktion/db/db.go
+++ b/src/myaktion/db/db.go
@@ -6,7 +6,7 @@ import (
"os"
log "github.com/sirupsen/logrus"
- "gitlab.reutlingen-university.de/go-exercises/myaktion-go/src/myaktion/model"
+ "gitlab.reutlingen-university.de/go-exercises/myaktion-go-ss2023/src/myaktion/model"
"gorm.io/driver/mysql"
"gorm.io/gorm"
)
diff --git a/src/myaktion/go.mod b/src/myaktion/go.mod
index 6ac657a..9a54c3f 100644
--- a/src/myaktion/go.mod
+++ b/src/myaktion/go.mod
@@ -1,4 +1,4 @@
-module gitlab.reutlingen-university.de/go-exercises/myaktion-go/src/myaktion
+module gitlab.reutlingen-university.de/go-exercises/myaktion-go-ss2023/src/myaktion
go 1.20
diff --git a/src/myaktion/handler/campaign.go b/src/myaktion/handler/campaign.go
index 705a2b9..874b006 100644
--- a/src/myaktion/handler/campaign.go
+++ b/src/myaktion/handler/campaign.go
@@ -6,8 +6,8 @@ import (
log "github.com/sirupsen/logrus"
- "gitlab.reutlingen-university.de/go-exercises/myaktion-go/src/myaktion/model"
- "gitlab.reutlingen-university.de/go-exercises/myaktion-go/src/myaktion/service"
+ "gitlab.reutlingen-university.de/go-exercises/myaktion-go-ss2023/src/myaktion/model"
+ "gitlab.reutlingen-university.de/go-exercises/myaktion-go-ss2023/src/myaktion/service"
)
func CreateCampaign(w http.ResponseWriter, r *http.Request) {
diff --git a/src/myaktion/handler/campaign_test.go b/src/myaktion/handler/campaign_test.go
index 1f33dfe..0a54130 100644
--- a/src/myaktion/handler/campaign_test.go
+++ b/src/myaktion/handler/campaign_test.go
@@ -7,9 +7,9 @@ import (
"net/http/httptest"
"testing"
- "gitlab.reutlingen-university.de/go-exercises/myaktion-go/src/myaktion/db"
- "gitlab.reutlingen-university.de/go-exercises/myaktion-go/src/myaktion/handler"
- "gitlab.reutlingen-university.de/go-exercises/myaktion-go/src/myaktion/model"
+ "gitlab.reutlingen-university.de/go-exercises/myaktion-go-ss2023/src/myaktion/db"
+ "gitlab.reutlingen-university.de/go-exercises/myaktion-go-ss2023/src/myaktion/handler"
+ "gitlab.reutlingen-university.de/go-exercises/myaktion-go-ss2023/src/myaktion/model"
)
func TestCreateCampaignBadRequest(t *testing.T) {
diff --git a/src/myaktion/handler/donation.go b/src/myaktion/handler/donation.go
index 081cd4a..048c820 100644
--- a/src/myaktion/handler/donation.go
+++ b/src/myaktion/handler/donation.go
@@ -6,8 +6,8 @@ import (
log "github.com/sirupsen/logrus"
- "gitlab.reutlingen-university.de/go-exercises/myaktion-go/src/myaktion/model"
- "gitlab.reutlingen-university.de/go-exercises/myaktion-go/src/myaktion/service"
+ "gitlab.reutlingen-university.de/go-exercises/myaktion-go-ss2023/src/myaktion/model"
+ "gitlab.reutlingen-university.de/go-exercises/myaktion-go-ss2023/src/myaktion/service"
)
func AddDonation(w http.ResponseWriter, r *http.Request) {
diff --git a/src/myaktion/handler/health_test.go b/src/myaktion/handler/health_test.go
index ac191cc..228c7e2 100644
--- a/src/myaktion/handler/health_test.go
+++ b/src/myaktion/handler/health_test.go
@@ -1,15 +1,17 @@
-package handler
+package handler_test
import (
"net/http"
"net/http/httptest"
"testing"
+
+ "gitlab.reutlingen-university.de/go-exercises/myaktion-go-ss2023/src/myaktion/handler"
)
func TestHealth(t *testing.T) {
rr := httptest.NewRecorder()
req := httptest.NewRequest("GET", "/health", nil)
- handler := http.HandlerFunc(Health)
+ handler := http.HandlerFunc(handler.Health)
handler.ServeHTTP(rr, req)
if status := rr.Code; status != http.StatusOK {
diff --git a/src/myaktion/main.go b/src/myaktion/main.go
index 59d6650..0643a49 100644
--- a/src/myaktion/main.go
+++ b/src/myaktion/main.go
@@ -9,8 +9,8 @@ import (
"net/http"
"github.com/gorilla/mux"
- "gitlab.reutlingen-university.de/go-exercises/myaktion-go/src/myaktion/db"
- "gitlab.reutlingen-university.de/go-exercises/myaktion-go/src/myaktion/handler"
+ "gitlab.reutlingen-university.de/go-exercises/myaktion-go-ss2023/src/myaktion/db"
+ "gitlab.reutlingen-university.de/go-exercises/myaktion-go-ss2023/src/myaktion/handler"
)
func init() {
@@ -32,7 +32,7 @@ func main() {
fmt.Println("Starting MyAktion API server")
router := mux.NewRouter()
router.HandleFunc("/health", handler.Health).Methods("GET")
- router.HandleFunc("/campaign", handler.CreateCampaign).Methods("POST")
+ router.HandleFunc("/campaigns", handler.CreateCampaign).Methods("POST")
router.HandleFunc("/campaigns", handler.GetCampaigns).Methods("GET")
router.HandleFunc("/campaigns/{id}", handler.GetCampaign).Methods("GET")
router.HandleFunc("/campaigns/{id}", handler.UpdateCampaign).Methods("PUT")
diff --git a/src/myaktion/service/campaign.go b/src/myaktion/service/campaign.go
index f743696..f8b7a3e 100644
--- a/src/myaktion/service/campaign.go
+++ b/src/myaktion/service/campaign.go
@@ -6,8 +6,8 @@ import (
log "github.com/sirupsen/logrus"
"gorm.io/gorm"
- "gitlab.reutlingen-university.de/go-exercises/myaktion-go/src/myaktion/db"
- "gitlab.reutlingen-university.de/go-exercises/myaktion-go/src/myaktion/model"
+ "gitlab.reutlingen-university.de/go-exercises/myaktion-go-ss2023/src/myaktion/db"
+ "gitlab.reutlingen-university.de/go-exercises/myaktion-go-ss2023/src/myaktion/model"
)
func CreateCampaign(campaign *model.Campaign) error {
diff --git a/src/myaktion/service/donation.go b/src/myaktion/service/donation.go
index 6f3c26e..5655d40 100644
--- a/src/myaktion/service/donation.go
+++ b/src/myaktion/service/donation.go
@@ -3,8 +3,8 @@ package service
import (
log "github.com/sirupsen/logrus"
- "gitlab.reutlingen-university.de/go-exercises/myaktion-go/src/myaktion/db"
- "gitlab.reutlingen-university.de/go-exercises/myaktion-go/src/myaktion/model"
+ "gitlab.reutlingen-university.de/go-exercises/myaktion-go-ss2023/src/myaktion/db"
+ "gitlab.reutlingen-university.de/go-exercises/myaktion-go-ss2023/src/myaktion/model"
)
func AddDonation(campaignId uint, donation *model.Donation) error {
--
GitLab