Skip to content

Commit f175ecc

Browse files
IgorPolyakovIgorPolyakov
committed
rename it again
1 parent e04f480 commit f175ecc

24 files changed

+111
-111
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@ attach-db:
8989

9090
# Generate Go server boilerplate from OpenAPI 3
9191
codegen:
92-
oapi-codegen -generate models,chi -o internal/server/server.gen.go --package server api/openapi.yaml
92+
oapi-codegen -generate models,chi -o internal/httpserver/httphttpserver.gen.go --package httpserver api/openapi.yaml

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ We welcome contributions! Please see our [Contributing Guidelines](docs/CONTRIBU
5050
│ │ └── *.go
5151
│   ├── repository # work with db, query ...
5252
│ │ └── *.go
53-
│   ├── server # autogenerated code from oapi-codegen
53+
│   ├── httpserver # autogenerated code from oapi-codegen
5454
│   │   ├── html_spa.go
55-
│   │   └── server.gen.go
55+
│   │   └── httpserver.gen.go
5656
│   └── view
5757
│   └── session.go
5858
├── pkg
@@ -113,7 +113,7 @@ will be available on - [http://localhost:4102](http://localhost:4102)
113113
### Generate code from openapi schema
114114

115115
```shell
116-
oapi-codegen -generate models,chi -o internal/server/server.gen.go --package routers api/openapi.yaml
116+
oapi-codegen -generate models,chi -o internal/server/httpserver.gen.go --package routers api/openapi.yaml
117117
```
118118

119119
## DataBase

‎cmd/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77

88
"ctf01d/internal/config"
99
"ctf01d/internal/handler"
10+
"ctf01d/internal/httpserver"
1011
migration "ctf01d/internal/migrations/psql"
11-
"ctf01d/internal/server"
1212
"github.com/go-chi/chi/v5"
1313
"github.com/go-chi/cors"
1414
_ "github.com/lib/pq"
@@ -57,8 +57,8 @@ func main() {
5757
}
5858
svr := handler.NewServerInterfaceWrapper(hndlr)
5959

60-
router.Mount("/api/", server.HandlerFromMux(svr, router))
61-
router.Mount("/", http.HandlerFunc(server.NewHtmlRouter))
60+
router.Mount("/api/", httpserver.HandlerFromMux(svr, router))
61+
router.Mount("/", http.HandlerFunc(httpserver.NewHtmlRouter))
6262

6363
slog.Info("Server run on", slog.String("host", cfg.HTTP.Host), slog.String("port", cfg.HTTP.Port))
6464
err = http.ListenAndServe(cfg.HTTP.Host+":"+cfg.HTTP.Port, router)

‎internal/handler/avatar.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"log/slog"
55
"net/http"
66

7-
"ctf01d/internal/server"
7+
"ctf01d/internal/httpserver"
88
"ctf01d/pkg/avatar"
99
)
1010

11-
func (h *Handler) UniqueAvatar(w http.ResponseWriter, r *http.Request, username string, params server.UniqueAvatarParams) {
11+
func (h *Handler) UniqueAvatar(w http.ResponseWriter, r *http.Request, username string, params httpserver.UniqueAvatarParams) {
1212
xMax := 100
1313
yMax := 100
1414
if params.Max != nil {

‎internal/handler/games.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import (
66
"net/http"
77

88
"ctf01d/internal/helper"
9+
"ctf01d/internal/httpserver"
910
"ctf01d/internal/model"
1011
"ctf01d/internal/repository"
11-
"ctf01d/internal/server"
1212
openapi_types "github.com/oapi-codegen/runtime/types"
1313
)
1414

1515
func (h *Handler) CreateGame(w http.ResponseWriter, r *http.Request) {
16-
var game server.GameRequest
16+
var game httpserver.GameRequest
1717
var err error
1818
if err := json.NewDecoder(r.Body).Decode(&game); err != nil {
1919
slog.Warn(err.Error(), "handler", "CreateGame")
@@ -69,7 +69,7 @@ func (h *Handler) ListGames(w http.ResponseWriter, r *http.Request) {
6969
helper.RespondWithJSON(w, http.StatusBadRequest, map[string]string{"error": "Failed to fetch games"})
7070
return
7171
}
72-
gameResponses := make([]*server.GameResponse, 0, len(games))
72+
gameResponses := make([]*httpserver.GameResponse, 0, len(games))
7373
for _, game := range games {
7474
gameResponses = append(gameResponses, game.ToResponseGameDetails())
7575
}
@@ -79,7 +79,7 @@ func (h *Handler) ListGames(w http.ResponseWriter, r *http.Request) {
7979

8080
func (h *Handler) UpdateGame(w http.ResponseWriter, r *http.Request, id openapi_types.UUID) {
8181
// fixme update не проверяет есть ли запись в бд
82-
var game server.GameRequest
82+
var game httpserver.GameRequest
8383
if err := json.NewDecoder(r.Body).Decode(&game); err != nil {
8484
slog.Warn(err.Error(), "handler", "UpdateGame")
8585
helper.RespondWithJSON(w, http.StatusBadRequest, map[string]string{"error": "Invalid request payload"})

‎internal/handler/interface.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package handler
33
import (
44
"net/http"
55

6-
"ctf01d/internal/server"
6+
"ctf01d/internal/httpserver"
77
openapi_types "github.com/oapi-codegen/runtime/types"
88
)
99

@@ -120,7 +120,7 @@ func (siw *ServerInterfaceWrapper) TeamMembers(w http.ResponseWriter, r *http.Re
120120
siw.handlers.TeamMembers(w, r, teamId)
121121
}
122122

123-
func (siw *ServerInterfaceWrapper) ListUniversities(w http.ResponseWriter, r *http.Request, params server.ListUniversitiesParams) {
123+
func (siw *ServerInterfaceWrapper) ListUniversities(w http.ResponseWriter, r *http.Request, params httpserver.ListUniversitiesParams) {
124124
siw.handlers.ListUniversities(w, r, params)
125125
}
126126

@@ -156,6 +156,6 @@ func (siw *ServerInterfaceWrapper) UploadService(w http.ResponseWriter, r *http.
156156
siw.handlers.UploadService(w, r, id)
157157
}
158158

159-
func (siw *ServerInterfaceWrapper) UniqueAvatar(w http.ResponseWriter, r *http.Request, username string, params server.UniqueAvatarParams) {
159+
func (siw *ServerInterfaceWrapper) UniqueAvatar(w http.ResponseWriter, r *http.Request, username string, params httpserver.UniqueAvatarParams) {
160160
siw.handlers.UniqueAvatar(w, r, username, params)
161161
}

‎internal/handler/results.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import (
66
"net/http"
77

88
"ctf01d/internal/helper"
9+
"ctf01d/internal/httpserver"
910
"ctf01d/internal/model"
1011
"ctf01d/internal/repository"
11-
"ctf01d/internal/server"
1212
openapi_types "github.com/oapi-codegen/runtime/types"
1313
)
1414

1515
func (h *Handler) CreateResult(w http.ResponseWriter, r *http.Request, gameId openapi_types.UUID) {
16-
var result server.ResultRequest
16+
var result httpserver.ResultRequest
1717
var err error
1818
if err := json.NewDecoder(r.Body).Decode(&result); err != nil {
1919
slog.Warn(err.Error(), "handler", "CreateResultHandler")
@@ -47,7 +47,7 @@ func (h *Handler) GetResult(w http.ResponseWriter, r *http.Request, gameId opena
4747
}
4848

4949
func (h *Handler) UpdateResult(w http.ResponseWriter, r *http.Request, gameId openapi_types.UUID, resultId openapi_types.UUID) {
50-
var resultRequest server.ResultRequest
50+
var resultRequest httpserver.ResultRequest
5151
if err := json.NewDecoder(r.Body).Decode(&resultRequest); err != nil {
5252
slog.Warn(err.Error(), "handler", "UpdateResult")
5353
helper.RespondWithJSON(w, http.StatusBadRequest, map[string]string{"error": "Invalid request payload"})

‎internal/handler/services.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import (
66
"net/http"
77

88
"ctf01d/internal/helper"
9+
"ctf01d/internal/httpserver"
910
"ctf01d/internal/model"
1011
"ctf01d/internal/repository"
11-
"ctf01d/internal/server"
1212
openapi_types "github.com/oapi-codegen/runtime/types"
1313
)
1414

1515
func (h *Handler) CreateService(w http.ResponseWriter, r *http.Request) {
16-
var service server.ServiceRequest
16+
var service httpserver.ServiceRequest
1717
var err error
1818
if err := json.NewDecoder(r.Body).Decode(&service); err != nil {
1919
slog.Warn(err.Error(), "handler", "CreateServiceHandler")
@@ -69,7 +69,7 @@ func (h *Handler) ListServices(w http.ResponseWriter, r *http.Request) {
6969
}
7070

7171
func (h *Handler) UpdateService(w http.ResponseWriter, r *http.Request, id openapi_types.UUID) {
72-
var sr server.ServiceRequest
72+
var sr httpserver.ServiceRequest
7373
if err := json.NewDecoder(r.Body).Decode(&sr); err != nil {
7474
slog.Warn(err.Error(), "handler", "UpdateService")
7575
helper.RespondWithJSON(w, http.StatusBadRequest, map[string]string{"error": "Invalid request payload"})

‎internal/handler/sessions.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import (
66
"net/http"
77

88
"ctf01d/internal/helper"
9+
"ctf01d/internal/httpserver"
910
"ctf01d/internal/repository"
10-
"ctf01d/internal/server"
1111
"ctf01d/internal/view"
1212
openapi_types "github.com/oapi-codegen/runtime/types"
1313
)
1414

1515
func (h *Handler) SignInUser(w http.ResponseWriter, r *http.Request) {
16-
var req server.SignInUserJSONBody
16+
var req httpserver.SignInUserJSONBody
1717
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
1818
slog.Warn(err.Error(), "handler", "SignInUser")
1919
http.Error(w, "Invalid request body", http.StatusBadRequest)

‎internal/handler/teams.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ import (
66
"net/http"
77

88
"ctf01d/internal/helper"
9+
"ctf01d/internal/httpserver"
910
"ctf01d/internal/model"
1011
"ctf01d/internal/repository"
11-
"ctf01d/internal/server"
1212
openapi_types "github.com/oapi-codegen/runtime/types"
1313
)
1414

1515
func (h *Handler) CreateTeam(w http.ResponseWriter, r *http.Request) {
1616
// fixme - создание команды через апрупы - нужен стейт
17-
var team server.TeamRequest
17+
var team httpserver.TeamRequest
1818
var err error
1919
if err := json.NewDecoder(r.Body).Decode(&team); err != nil {
2020
slog.Warn(err.Error(), "handler", "CreateTeamHandler")
@@ -71,7 +71,7 @@ func (h *Handler) ListTeams(w http.ResponseWriter, r *http.Request) {
7171
}
7272

7373
func (h *Handler) UpdateTeam(w http.ResponseWriter, r *http.Request, id openapi_types.UUID) {
74-
var team server.TeamRequest
74+
var team httpserver.TeamRequest
7575
if err := json.NewDecoder(r.Body).Decode(&team); err != nil {
7676
slog.Warn(err.Error(), "handler", "UpdateTeamHandler")
7777
helper.RespondWithJSON(w, http.StatusBadRequest, map[string]string{"error": "Invalid request payload"})

0 commit comments

Comments
 (0)