diff --git a/cmd/teams-api-server/main.go b/cmd/teams-api-server/main.go index e69de29..e8d70ea 100644 --- a/cmd/teams-api-server/main.go +++ b/cmd/teams-api-server/main.go @@ -0,0 +1,21 @@ +package main + +import ( + "github.com/gin-gonic/gin" + "twdps.io/lab-api-teams/pkg/handler" + "twdps.io/lab-api-teams/pkg/repository" + "twdps.io/lab-api-teams/pkg/service" +) + +func main() { + router := gin.Default() + + teamRepo := repository.NewRedisTeamRepository() + teamService := service.NewTeamService(teamRepo) + teamHandler := handler.NewTeamHandler(teamService) + + router.GET("/teams", teamHandler.GetTeams) + router.POST("/teams", teamHandler.AddTeam) + + router.Run(":8080") +} diff --git a/go.mod b/go.mod index d34bc48..f750cb6 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,37 @@ module twdps.io/lab-api-teams go 1.20 + +require ( + github.com/gin-gonic/gin v1.9.1 + github.com/go-redis/redis/v8 v8.11.5 +) + +require ( + github.com/bytedance/sonic v1.9.1 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/gabriel-vasile/mimetype v1.4.2 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.14.0 // indirect + github.com/goccy/go-json v0.10.2 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/cpuid/v2 v2.2.4 // indirect + github.com/leodido/go-urn v1.2.4 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/pelletier/go-toml/v2 v2.0.8 // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/ugorji/go/codec v1.2.11 // indirect + golang.org/x/arch v0.3.0 // indirect + golang.org/x/crypto v0.9.0 // indirect + golang.org/x/net v0.10.0 // indirect + golang.org/x/sys v0.8.0 // indirect + golang.org/x/text v0.9.0 // indirect + google.golang.org/protobuf v1.30.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..170bf79 --- /dev/null +++ b/go.sum @@ -0,0 +1,84 @@ +github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= +github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s= +github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= +github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= +github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= +github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= +github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js= +github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= +github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= +github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= +github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= +github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= +github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= +github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= +github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= +github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k= +golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= +golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= +golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/pkg/domain/teams.go b/pkg/domain/teams.go index 13e4bee..e0eccf5 100644 --- a/pkg/domain/teams.go +++ b/pkg/domain/teams.go @@ -37,10 +37,10 @@ type TeamIntegration struct { IntegrationName string `json:"integrationName"` } -type TeamsRepository interface { +type TeamRepository interface { GetTeams() ([]Team, error) GetTeam(id string) (Team, error) AddTeam(newTeam Team) error - UpdateTeam(team Team) error - RemoveTeam(id string) (Team, error) + // UpdateTeam(team Team) error + // RemoveTeam(id string) (Team, error) } diff --git a/pkg/handler/handler.go b/pkg/handler/handler.go index e69de29..0992347 100644 --- a/pkg/handler/handler.go +++ b/pkg/handler/handler.go @@ -0,0 +1,43 @@ +package handler + +import ( + "log" + "net/http" + + "github.com/gin-gonic/gin" + "twdps.io/lab-api-teams/pkg/domain" + "twdps.io/lab-api-teams/pkg/service" +) + +type TeamHandler struct { + teamService service.TeamService +} + +func NewTeamHandler(teamService service.TeamService) *TeamHandler { + return &TeamHandler{teamService: teamService} +} + +func (handler *TeamHandler) GetTeams(c *gin.Context) { + teams, err := handler.teamService.GetTeams() + if err != nil { + log.Fatalf("Failed to call GetTeams %v", err) + } + + c.IndentedJSON(http.StatusOK, teams) +} + +func (handler *TeamHandler) AddTeam(c *gin.Context) { + var newTeam domain.Team + + if err := c.BindJSON(&newTeam); err != nil { + log.Printf("error %+v", err) + return + } + + err := handler.teamService.AddTeam(newTeam) + if err != nil { + c.IndentedJSON(http.StatusInternalServerError, err) + } + + c.IndentedJSON(http.StatusCreated, newTeam) +} diff --git a/pkg/repository/mock/mock_repository.go b/pkg/repository/mock/mock_repository.go index e69de29..c322447 100644 --- a/pkg/repository/mock/mock_repository.go +++ b/pkg/repository/mock/mock_repository.go @@ -0,0 +1,30 @@ +package mock + +import ( + "fmt" + + "twdps.io/lab-api-teams/pkg/domain" +) + +type MockRepository struct { + Teams []domain.Team +} + +func (m *MockRepository) GetTeams() ([]domain.Team, error) { + return m.Teams, nil +} + +func (m *MockRepository) AddTeam(newTeam domain.Team) error { + m.Teams = append(m.Teams, newTeam) + return nil +} + +func (m *MockRepository) GetTeam(id string) (domain.Team, error) { + for _, team := range m.Teams { + if id == team.TeamID { + return team, nil + } + } + + return domain.Team{}, fmt.Errorf("Team not found") +} diff --git a/pkg/repository/mock/teams_api_repository_test.go b/pkg/repository/mock/teams_api_repository_test.go index e69de29..10d27a3 100644 --- a/pkg/repository/mock/teams_api_repository_test.go +++ b/pkg/repository/mock/teams_api_repository_test.go @@ -0,0 +1,46 @@ +package mock + +import ( + "testing" + + "twdps.io/lab-api-teams/pkg/domain" + "twdps.io/lab-api-teams/pkg/service" +) + +func TestGetTeams(t *testing.T) { + mockRepository := &MockRepository{ + Teams: []domain.Team{ + {TeamID: "team-sapphire", TeamType: "normal", TeamDescription: "Sapphire frontend team", TeamRAM: 32, TeamCPU: 12, TeamRamLimit: 64, TeamCpuLimit: 24}, + }, + } + + teamService := service.NewTeamService(mockRepository) + teams, _ := teamService.GetTeams() + if len(teams) != 1 { + t.Errorf("expected %d teams got %d", 1, len(teams)) + } +} + +func TestAddTeam(t *testing.T) { + mockRepository := &MockRepository{ + Teams: []domain.Team{ + {TeamID: "team-sapphire", TeamType: "normal", TeamDescription: "Sapphire frontend team", TeamRAM: 32, TeamCPU: 12, TeamRamLimit: 64, TeamCpuLimit: 24}, + }, + } + + teamService := service.NewTeamService(mockRepository) + var newTeam = domain.Team{ + TeamID: "team-sapphire", TeamType: "normal", TeamDescription: "Sapphire frontend team", TeamRAM: 32, TeamCPU: 12, TeamRamLimit: 64, TeamCpuLimit: 24, + } + + err := teamService.AddTeam(newTeam) + if err != nil { + t.Errorf("failed to add team") + } + + teams, _ := teamService.GetTeams() + if len(teams) != 2 { + t.Errorf("expected %d teams got %d", 2, len(teams)) + } + +} diff --git a/pkg/repository/redis_teams_api_repository.go b/pkg/repository/redis_teams_api_repository.go index e69de29..31ae5a0 100644 --- a/pkg/repository/redis_teams_api_repository.go +++ b/pkg/repository/redis_teams_api_repository.go @@ -0,0 +1,79 @@ +package repository + +import ( + "context" + "encoding/json" + "fmt" + "log" + + "github.com/go-redis/redis/v8" + "twdps.io/lab-api-teams/pkg/domain" +) + +type RedisTeamRepository struct { + client *redis.Client + ctx context.Context +} + +func NewRedisTeamRepository() *RedisTeamRepository { + rdb := redis.NewClient(&redis.Options{ + Addr: "localhost:6379", + DB: 0, + }) + + return &RedisTeamRepository{ + client: rdb, + ctx: context.Background(), + } +} + +func (store *RedisTeamRepository) GetTeam(id string) (domain.Team, error) { + teamJson, err := store.client.Get(store.ctx, fmt.Sprintf("team:%s", id)).Result() + if err != nil { + return domain.Team{}, err + } + + var team domain.Team + if err := json.Unmarshal([]byte(teamJson), &team); err != nil { + return domain.Team{}, err + } + + return team, nil +} + +func (store *RedisTeamRepository) GetTeams() ([]domain.Team, error) { + teamKeys, err := store.client.Keys(store.ctx, "team:*").Result() + if err != nil { + return nil, err // TODO Redis Err handling + } + + fmt.Printf("%+v", teamKeys) + + var teams []domain.Team + for _, key := range teamKeys { + teamJson, err := store.client.Get(store.ctx, key).Result() + if err != nil { + return nil, err + } + + var team domain.Team + if err := json.Unmarshal([]byte(teamJson), &team); err != nil { + return nil, err + } + + teams = append(teams, team) + + } + + return teams, nil +} + +func (store *RedisTeamRepository) AddTeam(newTeam domain.Team) error { + teamJson, err := json.Marshal(newTeam) + if err != nil { + log.Fatalf("failed to marshal") + return err // Transient error - TODO + } + + return store.client.Set(store.ctx, fmt.Sprintf("team:%s", newTeam.TeamID), teamJson, 0).Err() +} diff --git a/pkg/service/service.go b/pkg/service/service.go index e69de29..4d99b61 100644 --- a/pkg/service/service.go +++ b/pkg/service/service.go @@ -0,0 +1,37 @@ +package service + +import ( + "fmt" + + domain "twdps.io/lab-api-teams/pkg/domain" +) + +type TeamService interface { + GetTeams() ([]domain.Team, error) + AddTeam(team domain.Team) error +} + +type teamServiceImpl struct { + repo domain.TeamRepository +} + +func NewTeamService(repo domain.TeamRepository) TeamService { + return &teamServiceImpl{ + repo: repo, + } +} + +func (s *teamServiceImpl) GetTeams() ([]domain.Team, error) { + teams, err := s.repo.GetTeams() + if err != nil { + return nil, fmt.Errorf("failed to fetch teams: %v", err) + } + return teams, err +} + +func (s *teamServiceImpl) AddTeam(newTeam domain.Team) error { + if err := s.repo.AddTeam(newTeam); err != nil { + return fmt.Errorf("could not add team: %v", err) + } + return nil +} diff --git a/scripts/curl.sh b/scripts/curl.sh new file mode 100644 index 0000000..40f59e7 --- /dev/null +++ b/scripts/curl.sh @@ -0,0 +1,2 @@ +curl http://localhost:8080/teams --include --header "Content-Type: application/json" --request "POST" --data '{"TeamID": "team-sapphire", "TeamType": "normal", "TeamDescription": "Sapphire frontend team", "TeamRAM": 32, "TeamCPU": 12, "TeamRamLimit": 64, "TeamCpuLimit": 24}' +curl http://localhost:8080/teams