diff --git a/src/myaktion/db/db.go b/src/myaktion/db/db.go index 2a5cf4dcc404e88da700bf0fc1e10d40d8faa538..cd79166dbfa4d4b172b496ea3cd54ba5c5820e78 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 6ac657a4acb8716fec297dbb226b30b30895be7c..9a54c3f656dfbb64e16de7479a1a2036da66164a 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 705a2b93e33d74933e4f9063c483aafc0e33b682..874b0066a2b347408e689a23d8ec8ac1a73b1e89 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 1f33dfe8d859efb7df4d055fc1ff5157d4bc3993..0a54130e52ab44ff4d7d23a851bff1569a1638a1 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 081cd4a1af72b54fe41c4be4554637164a8b6ec8..048c820223e0c0fbad7f2ae986ff68c79fd5ac1f 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 ac191cc3b183c2d1c95cb94215013e2eeb80a2e1..228c7e263c92f8f5f9aa0b0fbf567b5f9dc7d9e3 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 59d665033debbf6cae554d12914b841cca1aae08..0643a493e70eff5642eff52af8ab57601f339f88 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 f743696c15818c709b3d53910f3e11bd4935a3f7..f8b7a3e3c9c5f3197ddc80cc5e63261294bebdff 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 6f3c26e704d8647d4a76d61500914618e7d4e89e..5655d406e5dca3aa75e5b626927aafbd72a40295 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 {