Skip to content

Commit 40f6838

Browse files
IgorPolyakovIgorPolyakov
committed
fix lint & refactoring
1 parent 9cb6301 commit 40f6838

File tree

20 files changed

+135
-94
lines changed

20 files changed

+135
-94
lines changed

‎internal/handler/games.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func (h *Handler) CreateGame(w http.ResponseWriter, r *http.Request) {
3838
api_helpers.RespondWithJSON(w, http.StatusInternalServerError, map[string]string{"error": "Failed to create game"})
3939
return
4040
}
41-
api_helpers.RespondWithJSON(w, http.StatusOK, model.NewGameFromModel(newGame))
41+
api_helpers.RespondWithJSON(w, http.StatusOK, newGame.ToResponse())
4242
}
4343

4444
func (h *Handler) DeleteGame(w http.ResponseWriter, r *http.Request, id openapi_types.UUID) {
@@ -59,7 +59,7 @@ func (h *Handler) GetGameById(w http.ResponseWriter, r *http.Request, id openapi
5959
api_helpers.RespondWithJSON(w, http.StatusInternalServerError, map[string]string{"error": "Failed to fetch game"})
6060
return
6161
}
62-
api_helpers.RespondWithJSON(w, http.StatusOK, model.NewGameDetailsFromModel(game))
62+
api_helpers.RespondWithJSON(w, http.StatusOK, game.ToResponseGameDetails())
6363
}
6464

6565
func (h *Handler) ListGames(w http.ResponseWriter, r *http.Request) {
@@ -72,7 +72,7 @@ func (h *Handler) ListGames(w http.ResponseWriter, r *http.Request) {
7272
}
7373
gameResponses := make([]*server.GameResponse, 0, len(games))
7474
for _, game := range games {
75-
gameResponses = append(gameResponses, model.NewGameDetailsFromModel(game))
75+
gameResponses = append(gameResponses, game.ToResponseGameDetails())
7676
}
7777

7878
api_helpers.RespondWithJSON(w, http.StatusOK, gameResponses)

‎internal/handler/results.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func (h *Handler) CreateResult(w http.ResponseWriter, r *http.Request, gameId op
3232
api_helpers.RespondWithJSON(w, http.StatusInternalServerError, map[string]string{"error": "Failed to create result"})
3333
return
3434
}
35-
api_helpers.RespondWithJSON(w, http.StatusOK, model.NewResultFromModel(newResult, 0))
35+
api_helpers.RespondWithJSON(w, http.StatusOK, newResult.ToResponse(0))
3636
}
3737

3838
func (h *Handler) GetResult(w http.ResponseWriter, r *http.Request, gameId openapi_types.UUID, resultId openapi_types.UUID) {
@@ -44,7 +44,7 @@ func (h *Handler) GetResult(w http.ResponseWriter, r *http.Request, gameId opena
4444
api_helpers.RespondWithJSON(w, http.StatusBadRequest, map[string]string{"error": "Failed to fetch result"})
4545
return
4646
}
47-
api_helpers.RespondWithJSON(w, http.StatusOK, model.NewResultFromModel(result, 0))
47+
api_helpers.RespondWithJSON(w, http.StatusOK, result.ToResponse(0))
4848
}
4949

5050
func (h *Handler) UpdateResult(w http.ResponseWriter, r *http.Request, gameId openapi_types.UUID, resultId openapi_types.UUID) {
@@ -69,7 +69,7 @@ func (h *Handler) UpdateResult(w http.ResponseWriter, r *http.Request, gameId op
6969
return
7070
}
7171

72-
api_helpers.RespondWithJSON(w, http.StatusOK, model.NewResultFromModel(result, 0))
72+
api_helpers.RespondWithJSON(w, http.StatusOK, result.ToResponse(0))
7373
}
7474

7575
// GetScoreboard retrieves the scoreboard for a given game ID

‎internal/handler/services.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func (h *Handler) CreateService(w http.ResponseWriter, r *http.Request) {
3434
api_helpers.RespondWithJSON(w, http.StatusInternalServerError, map[string]string{"error": "Failed to create service"})
3535
return
3636
}
37-
api_helpers.RespondWithJSON(w, http.StatusOK, model.NewServiceFromModel(newService))
37+
api_helpers.RespondWithJSON(w, http.StatusOK, newService.ToResponse())
3838
}
3939

4040
func (h *Handler) DeleteService(w http.ResponseWriter, r *http.Request, id openapi_types.UUID) {
@@ -55,7 +55,7 @@ func (h *Handler) GetServiceById(w http.ResponseWriter, r *http.Request, id open
5555
api_helpers.RespondWithJSON(w, http.StatusInternalServerError, map[string]string{"error": "Failed to fetch service"})
5656
return
5757
}
58-
api_helpers.RespondWithJSON(w, http.StatusOK, model.NewServiceFromModel(service))
58+
api_helpers.RespondWithJSON(w, http.StatusOK, service.ToResponse())
5959
}
6060

6161
func (h *Handler) ListServices(w http.ResponseWriter, r *http.Request) {

‎internal/handler/teams.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func (h *Handler) CreateTeam(w http.ResponseWriter, r *http.Request) {
3636
api_helpers.RespondWithJSON(w, http.StatusInternalServerError, map[string]string{"error": "Failed to create team"})
3737
return
3838
}
39-
api_helpers.RespondWithJSON(w, http.StatusOK, model.NewTeamFromModel(newTeam))
39+
api_helpers.RespondWithJSON(w, http.StatusOK, newTeam.ToResponse())
4040
}
4141

4242
func (h *Handler) DeleteTeam(w http.ResponseWriter, r *http.Request, id openapi_types.UUID) {
@@ -57,7 +57,7 @@ func (h *Handler) GetTeamById(w http.ResponseWriter, r *http.Request, id openapi
5757
api_helpers.RespondWithJSON(w, http.StatusInternalServerError, map[string]string{"error": "Failed to fetch team"})
5858
return
5959
}
60-
api_helpers.RespondWithJSON(w, http.StatusOK, model.NewTeamFromModel(team))
60+
api_helpers.RespondWithJSON(w, http.StatusOK, team.ToResponse())
6161
}
6262

6363
func (h *Handler) ListTeams(w http.ResponseWriter, r *http.Request) {

‎internal/handler/users.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func (h *Handler) CreateUser(w http.ResponseWriter, r *http.Request) {
4848
return
4949
}
5050
}
51-
api_helpers.RespondWithJSON(w, http.StatusOK, model.NewUserFromModel(newUser))
51+
api_helpers.RespondWithJSON(w, http.StatusOK, newUser.ToResponse())
5252
}
5353

5454
func (h *Handler) DeleteUser(w http.ResponseWriter, r *http.Request, id openapi_types.UUID) {
@@ -69,7 +69,7 @@ func (h *Handler) GetUserById(w http.ResponseWriter, r *http.Request, id openapi
6969
api_helpers.RespondWithJSON(w, http.StatusInternalServerError, map[string]string{"error": "Failed to fetch user"})
7070
return
7171
}
72-
api_helpers.RespondWithJSON(w, http.StatusOK, model.NewUserFromModel(user))
72+
api_helpers.RespondWithJSON(w, http.StatusOK, user.ToResponse())
7373
}
7474

7575
func (h *Handler) GetProfileById(w http.ResponseWriter, r *http.Request, id openapi_types.UUID) {
@@ -80,7 +80,7 @@ func (h *Handler) GetProfileById(w http.ResponseWriter, r *http.Request, id open
8080
api_helpers.RespondWithJSON(w, http.StatusNotFound, map[string]string{"data": "User have not profile"})
8181
return
8282
}
83-
api_helpers.RespondWithJSON(w, http.StatusOK, model.NewProfileFromModel(userProfile))
83+
api_helpers.RespondWithJSON(w, http.StatusOK, userProfile.ToResponse())
8484
}
8585

8686
func (h *Handler) ListUsers(w http.ResponseWriter, r *http.Request) {

‎internal/migrations/psql/update0020_update0020testdata.go‎

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ func DatabaseUpdate_update0020_update0020testdata(db *sql.DB, getInfo bool) (str
2929
// Очистка таблицы team_games
3030
_, err = tx.Exec(`DELETE FROM team_games`)
3131
if err != nil {
32-
tx.Rollback()
32+
err = tx.Rollback()
33+
if err != nil {
34+
slog.Error("Failed to rollback: " + err.Error())
35+
return fromUpdateId, toUpdateId, description, err
36+
}
3337
slog.Error("Failed to clear team_games table: " + err.Error())
3438
return fromUpdateId, toUpdateId, description, err
3539
}
@@ -48,15 +52,23 @@ func DatabaseUpdate_update0020_update0020testdata(db *sql.DB, getInfo bool) (str
4852

4953
_, err = tx.Exec(query)
5054
if err != nil {
51-
tx.Rollback()
55+
err = tx.Rollback()
56+
if err != nil {
57+
slog.Error("Failed to rollback: " + err.Error())
58+
return fromUpdateId, toUpdateId, description, err
59+
}
5260
slog.Error("Problem with query execution, query: " + query + "\n error:" + err.Error())
5361
return fromUpdateId, toUpdateId, description, err
5462
}
5563

5664
// Получение существующих команд из базы данных
5765
teamRows, err := tx.Query(`SELECT id, name FROM teams`)
5866
if err != nil {
59-
tx.Rollback()
67+
err = tx.Rollback()
68+
if err != nil {
69+
slog.Error("Failed to rollback: " + err.Error())
70+
return fromUpdateId, toUpdateId, description, err
71+
}
6072
slog.Error("Failed to fetch existing teams: " + err.Error())
6173
return fromUpdateId, toUpdateId, description, err
6274
}
@@ -70,7 +82,11 @@ func DatabaseUpdate_update0020_update0020testdata(db *sql.DB, getInfo bool) (str
7082
for teamRows.Next() {
7183
var id, name string
7284
if err := teamRows.Scan(&id, &name); err != nil {
73-
tx.Rollback()
85+
err = tx.Rollback()
86+
if err != nil {
87+
slog.Error("Failed to rollback: " + err.Error())
88+
return fromUpdateId, toUpdateId, description, err
89+
}
7490
slog.Error("Failed to scan team: " + err.Error())
7591
return fromUpdateId, toUpdateId, description, err
7692
}
@@ -83,7 +99,11 @@ func DatabaseUpdate_update0020_update0020testdata(db *sql.DB, getInfo bool) (str
8399
// Получение существующих игр из базы данных
84100
gameRows, err := tx.Query(`SELECT id, description FROM games`)
85101
if err != nil {
86-
tx.Rollback()
102+
err = tx.Rollback()
103+
if err != nil {
104+
slog.Error("Failed to rollback: " + err.Error())
105+
return fromUpdateId, toUpdateId, description, err
106+
}
87107
slog.Error("Failed to fetch existing games: " + err.Error())
88108
return fromUpdateId, toUpdateId, description, err
89109
}
@@ -97,7 +117,11 @@ func DatabaseUpdate_update0020_update0020testdata(db *sql.DB, getInfo bool) (str
97117
for gameRows.Next() {
98118
var id, description string
99119
if err := gameRows.Scan(&id, &description); err != nil {
100-
tx.Rollback()
120+
err = tx.Rollback()
121+
if err != nil {
122+
slog.Error("Failed to rollback: " + err.Error())
123+
return fromUpdateId, toUpdateId, description, err
124+
}
101125
slog.Error("Failed to scan game: " + err.Error())
102126
return fromUpdateId, toUpdateId, description, err
103127
}
@@ -113,7 +137,11 @@ func DatabaseUpdate_update0020_update0020testdata(db *sql.DB, getInfo bool) (str
113137
_, err = tx.Exec(`INSERT INTO results (score, rank, id, team_id, game_id) VALUES ($1, $2, $3, $4, $5)`,
114138
score, rank+1, uuid.New().String(), team.ID, game.ID)
115139
if err != nil {
116-
tx.Rollback()
140+
err = tx.Rollback()
141+
if err != nil {
142+
slog.Error("Failed to rollback: " + err.Error())
143+
return fromUpdateId, toUpdateId, description, err
144+
}
117145
slog.Error("Failed to insert result: " + err.Error())
118146
return fromUpdateId, toUpdateId, description, err
119147
}
@@ -122,7 +150,11 @@ func DatabaseUpdate_update0020_update0020testdata(db *sql.DB, getInfo bool) (str
122150
_, err = tx.Exec(`INSERT INTO team_games (team_id, game_id) VALUES ($1, $2)`,
123151
team.ID, game.ID)
124152
if err != nil {
125-
tx.Rollback()
153+
err = tx.Rollback()
154+
if err != nil {
155+
slog.Error("Failed to rollback: " + err.Error())
156+
return fromUpdateId, toUpdateId, description, err
157+
}
126158
slog.Error("Failed to insert team_game: " + err.Error())
127159
return fromUpdateId, toUpdateId, description, err
128160
}

‎internal/model/game.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type GameDetails struct {
2020
Teams []*Team
2121
}
2222

23-
func NewGameFromModel(m *Game) *server.GameResponse {
23+
func (m *Game) ToResponse() *server.GameResponse {
2424
return &server.GameResponse{
2525
Id: m.Id,
2626
StartTime: m.StartTime,
@@ -29,7 +29,7 @@ func NewGameFromModel(m *Game) *server.GameResponse {
2929
}
3030
}
3131

32-
func NewGameDetailsFromModel(m *GameDetails) *server.GameResponse {
32+
func (m *GameDetails) ToResponseGameDetails() *server.GameResponse {
3333
teams := make([]server.TeamResponse, 0, len(m.Teams))
3434
for _, t := range m.Teams {
3535
teams = append(teams, server.TeamResponse{
@@ -51,7 +51,7 @@ func NewGameDetailsFromModel(m *GameDetails) *server.GameResponse {
5151
func NewGamesFromModels(ms []*Game) []*server.GameResponse {
5252
var games []*server.GameResponse
5353
for _, m := range ms {
54-
games = append(games, NewGameFromModel(m))
54+
games = append(games, m.ToResponse())
5555
}
5656
return games
5757
}

‎internal/model/profile.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type ProfileWithHistory struct {
2828
History []ProfileTeams
2929
}
3030

31-
func NewProfileFromModel(p *ProfileWithHistory) *server.ProfileResponse {
31+
func (p *ProfileWithHistory) ToResponse() *server.ProfileResponse {
3232
return &server.ProfileResponse{
3333
Id: p.Profile.Id,
3434
CreatedAt: p.Profile.CreatedAt,

‎internal/model/result.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ type Result struct {
1313
Score float64 `db:"score" json:"score"`
1414
}
1515

16-
func NewResultFromModel(s *Result, rank int) *server.ResultResponse {
16+
func (s *Result) ToResponse(rank int) *server.ResultResponse {
1717
return &server.ResultResponse{
1818
Id: s.Id,
1919
GameId: s.GameId,
@@ -26,7 +26,7 @@ func NewResultFromModel(s *Result, rank int) *server.ResultResponse {
2626
func NewScoreboardFromResults(ms []*Result) []*server.ResultResponse {
2727
var results []*server.ResultResponse
2828
for i, r := range ms {
29-
results = append(results, NewResultFromModel(r, i+1))
29+
results = append(results, r.ToResponse(i+1))
3030
}
3131
return results
3232
}

‎internal/model/service.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type Service struct {
1818
IsPublic bool `db:"is_public" json:"is_public"`
1919
}
2020

21-
func NewServiceFromModel(s *Service) *server.ServiceResponse {
21+
func (s *Service) ToResponse() *server.ServiceResponse {
2222
var logo string
2323
if s.LogoUrl.Valid {
2424
logo = s.LogoUrl.String
@@ -38,7 +38,7 @@ func NewServiceFromModel(s *Service) *server.ServiceResponse {
3838
func NewServiceFromModels(ms []*Service) []*server.ServiceResponse {
3939
var services []*server.ServiceResponse
4040
for _, s := range ms {
41-
services = append(services, NewServiceFromModel(s))
41+
services = append(services, s.ToResponse())
4242
}
4343
return services
4444
}

0 commit comments

Comments
 (0)