Skip to content

Commit d4c4255

Browse files
COMTOP1COMTOP1
committed
Fixing more linting
1 parent 7ab0c90 commit d4c4255

File tree

8 files changed

+85
-32
lines changed

8 files changed

+85
-32
lines changed

‎client/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func NewClient(baseURL string) (*Client, error) {
3838
func (c *Client) sendRequest(req *http.Request, apiKey string, v interface{}) error {
3939
req.Header.Set("Content-Type", "application/json; charset=utf-8")
4040
req.Header.Set("Accept", "application/json; charset=utf-8")
41-
req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", apiKey))
41+
req.Header.Set("Authorization", "Bearer "+apiKey)
4242

4343
res, err := c.HTTPClient.Do(req)
4444
if err != nil {

‎client/types/types.go

+16-10
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,15 @@ type (
5959
)
6060

6161
const (
62-
FIVE UserPaginationSize = 5
63-
TEN UserPaginationSize = 10
64-
TWENTY_FIVE UserPaginationSize = 25
65-
FIFTY UserPaginationSize = 50
62+
FIVE UserPaginationSize = 5
63+
TEN UserPaginationSize = 10
64+
//nolint:revive
65+
TWENTY_FIVE UserPaginationSize = 25
66+
FIFTY UserPaginationSize = 50
67+
//nolint:revive
6668
SEVENTY_FIVE UserPaginationSize = 75
67-
ONE_HUNDRED UserPaginationSize = 100
69+
//nolint:revive
70+
ONE_HUNDRED UserPaginationSize = 100
6871
)
6972

7073
const (
@@ -73,10 +76,12 @@ const (
7376
)
7477

7578
const (
76-
USER_ID UserPaginationColumn = "userId"
77-
NAME UserPaginationColumn = "name"
78-
USERNAME UserPaginationColumn = "username"
79-
EMAIL UserPaginationColumn = "email"
79+
//nolint:revive
80+
USER_ID UserPaginationColumn = "userId"
81+
NAME UserPaginationColumn = "name"
82+
USERNAME UserPaginationColumn = "username"
83+
EMAIL UserPaginationColumn = "email"
84+
//nolint:revive
8085
LAST_LOGIN UserPaginationColumn = "lastLogin"
8186
)
8287

@@ -86,6 +91,7 @@ const (
8691
)
8792

8893
const (
89-
DELETED UserPaginationDeleted = "deleted"
94+
DELETED UserPaginationDeleted = "deleted"
95+
//nolint:revive
9096
NOT_DELETED UserPaginationDeleted = "not_deleted"
9197
)

‎cmd/migrate-db/main.go

+3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ func main() {
4040
Password: os.Getenv("WAPI_DB_PASS"),
4141
}
4242
database, err := utils.NewDB(dbConfig)
43+
if err != nil {
44+
log.Fatalf("failed to connect to database: %v", err)
45+
}
4346

4447
goose.SetBaseFS(migrations.Migrations)
4548
if err = goose.SetDialect("postgres"); err != nil {

‎controllers/v1/creator/series.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,18 @@ func (s *Store) UpdateSeries(c echo.Context) error {
7979

8080
_ = claims
8181

82-
//series1.UpdatedBy = &claims.UserID
82+
// series1.UpdatedBy = &claims.UserID
8383
//
84-
//var videoIDs []int
85-
//for _, v := range series1.Videos {
84+
// var videoIDs []int
85+
// for _, v := range series1.Videos {
8686
// videoIDs = append(videoIDs, v.ID)
87-
//}
87+
// }
8888
//
89-
//err = s.series.Update(c.Request().Context(), series1.Meta, videoIDs)
90-
//if err != nil {
89+
// err = s.series.Update(c.Request().Context(), series1.Meta, videoIDs)
90+
// if err != nil {
9191
// err = fmt.Errorf("SeriesUpdate: failed to update series: %w", err)
9292
// return echo.NewHTTPError(http.StatusInternalServerError, err)
93-
//}
93+
// }
9494

9595
return c.NoContent(http.StatusOK)
9696
}
@@ -109,11 +109,11 @@ func (s *Store) DeleteSeries(c echo.Context) error {
109109
return echo.NewHTTPError(http.StatusBadRequest, "invalid id")
110110
}
111111

112-
//err = s.series.DeleteSeries(c.Request().Context(), seriesID)
113-
//if err != nil {
112+
// err = s.series.DeleteSeries(c.Request().Context(), seriesID)
113+
// if err != nil {
114114
// err = fmt.Errorf("DeleteSeries failed: %w", err)
115115
// return c.JSON(http.StatusInternalServerError, err)
116-
//}
116+
// }
117117

118118
_ = seriesID
119119

‎controllers/v1/people/officership.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ func (s *Store) ListOfficerships(c echo.Context) error {
4747
var dbStatus people.OfficershipsStatus
4848
switch officershipStatus {
4949
case "current", "":
50-
officershipStatus = "current"
5150
dbStatus = people.Current
5251
case "retired":
5352
dbStatus = people.Retired
@@ -255,12 +254,12 @@ func (s *Store) ListOfficershipTeams(c echo.Context) error {
255254
// @Success 200 {object} people.OfficershipTeam
256255
// @Router /v1/internal/people/officership/team/{officershipteamid} [get]
257256
func (s *Store) GetOfficershipTeam(c echo.Context) error {
258-
officershipTeamId, err := strconv.Atoi(c.Param("officershipteamid"))
257+
officershipTeamID, err := strconv.Atoi(c.Param("officershipteamid"))
259258
if err != nil {
260259
return echo.NewHTTPError(http.StatusBadRequest, "invalid officership team id")
261260
}
262261

263-
team, err := s.people.GetOfficershipTeam(c.Request().Context(), people.OfficershipTeamGetDTO{TeamID: officershipTeamId})
262+
team, err := s.people.GetOfficershipTeam(c.Request().Context(), people.OfficershipTeamGetDTO{TeamID: officershipTeamID})
264263
if err != nil {
265264
err = fmt.Errorf("GetOfficershipTeam failed to get officership team: %w", err)
266265
return echo.NewHTTPError(http.StatusInternalServerError, err)
@@ -406,7 +405,6 @@ func (s *Store) ListOfficers(c echo.Context) error {
406405
var dbOfficershipStatus, dbOfficerStatus people.OfficershipsStatus
407406
switch officershipStatus {
408407
case "current", "":
409-
officershipStatus = "current"
410408
dbOfficershipStatus = people.Current
411409
case "retired":
412410
dbOfficershipStatus = people.Retired
@@ -419,7 +417,6 @@ func (s *Store) ListOfficers(c echo.Context) error {
419417

420418
switch officerStatus {
421419
case "current", "":
422-
officerStatus = "current"
423420
dbOfficerStatus = people.Current
424421
case "retired":
425422
dbOfficerStatus = people.Retired

‎controllers/v1/stream/stream.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ func (s *Store) NewStream(c echo.Context) error {
371371
}
372372

373373
if startTime.Valid {
374-
diffStartEnd := startTime.Time.Compare(startTime.Time)
374+
diffStartEnd := startTime.Time.Compare(*newEndpoint.EndValid)
375375
if diffStartEnd != -1 {
376376
return echo.NewHTTPError(http.StatusBadRequest, "NewStream: end date must be after start date")
377377
}
@@ -458,7 +458,7 @@ func (s *Store) EditStream(c echo.Context) error {
458458
}
459459

460460
if startTime.Valid {
461-
diffStartEnd := startTime.Time.Compare(startTime.Time)
461+
diffStartEnd := startTime.Time.Compare(*editEndpoint.EndValid)
462462
if diffStartEnd != -1 {
463463
return echo.NewHTTPError(http.StatusBadRequest, "EditStream: end date must be after start date")
464464
}

‎services/people/role.go

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ func (s *Store) GetRoleFull(ctx context.Context, roleID int) (RoleFull, error) {
7474
return RoleFull{}, fmt.Errorf("failed to get permissions for role \"%d\": %w", r.RoleID, err)
7575
}
7676

77+
//nolint:musttag
7778
err = s.db.SelectContext(ctx, &r.Users, `
7879
SELECT u.user_id, avatar, nickname, first_name, last_name
7980
FROM people.users u

‎services/public/teams.go

+50-4
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,28 @@ type (
4848
}
4949
)
5050

51+
func (s *Store) TeamMemberDBToTeamMember(teamMember TeamMemberDB) TeamMember {
52+
var startDate, endDate *time.Time
53+
if teamMember.StartDate.Valid {
54+
startDate = &teamMember.StartDate.Time
55+
}
56+
if teamMember.EndDate.Valid {
57+
endDate = &teamMember.EndDate.Time
58+
}
59+
return TeamMember{
60+
UserID: teamMember.UserID,
61+
UserName: teamMember.UserName,
62+
Avatar: teamMember.Avatar,
63+
OfficerID: teamMember.OfficerID,
64+
EmailAlias: teamMember.EmailAlias,
65+
OfficerName: teamMember.OfficerName,
66+
OfficerDescription: teamMember.OfficerDescription,
67+
HistoryWikiURL: teamMember.HistoryWikiURL,
68+
StartDate: startDate,
69+
EndDate: endDate,
70+
}
71+
}
72+
5173
// ListTeams returns a list of the ystv teams and their current members.
5274
func (s *Store) ListTeams(ctx context.Context) ([]Team, error) {
5375
var t []Team
@@ -152,7 +174,9 @@ func (s *Store) GetTeamByYearByEmail(ctx context.Context, emailAlias string, yea
152174
return t, fmt.Errorf("failed to get team by year by email: %w", err)
153175
}
154176

155-
err = s.db.SelectContext(ctx, &t.Members, `
177+
teamMembers := make([]TeamMemberDB, 0)
178+
179+
err = s.db.SelectContext(ctx, &teamMembers, `
156180
SELECT users.user_id, CONCAT(users.first_name, ' ', users.last_name) AS user_name, COALESCE(users.avatar, '') AS avatar, officer.officer_id,
157181
officer.email_alias, officer.name AS officer_name, officer.description AS officer_description,
158182
officer.historywiki_url, officerTeamMembers.start_date, officerTeamMembers.end_date
@@ -175,6 +199,10 @@ func (s *Store) GetTeamByYearByEmail(ctx context.Context, emailAlias string, yea
175199
return t, fmt.Errorf("failed to get team members by year by email: %w", err)
176200
}
177201

202+
for _, teamMember := range teamMembers {
203+
t.Members = append(t.Members, s.TeamMemberDBToTeamMember(teamMember))
204+
}
205+
178206
return t, nil
179207
}
180208

@@ -185,7 +213,9 @@ func (s *Store) GetTeamByYearByID(ctx context.Context, teamID, year int) (Team,
185213
return t, fmt.Errorf("failed to get team by year by id: %w", err)
186214
}
187215

188-
err = s.db.SelectContext(ctx, &t.Members, `
216+
teamMembers := make([]TeamMemberDB, 0)
217+
218+
err = s.db.SelectContext(ctx, &teamMembers, `
189219
SELECT users.user_id, CONCAT(users.first_name, ' ', users.last_name) AS user_name, COALESCE(users.avatar, '') AS avatar, officer.officer_id,
190220
officer.email_alias, officer.name AS officer_name, officer.description AS officer_description,
191221
officer.historywiki_url, officerTeamMembers.start_date, officerTeamMembers.end_date
@@ -208,6 +238,10 @@ func (s *Store) GetTeamByYearByID(ctx context.Context, teamID, year int) (Team,
208238
return t, fmt.Errorf("failed to get team members by year by id: %w", err)
209239
}
210240

241+
for _, teamMember := range teamMembers {
242+
t.Members = append(t.Members, s.TeamMemberDBToTeamMember(teamMember))
243+
}
244+
211245
return t, nil
212246
}
213247

@@ -218,7 +252,9 @@ func (s *Store) GetTeamByStartEndYearByEmail(ctx context.Context, emailAlias str
218252
return t, fmt.Errorf("failed to get team by start end year by email: %w", err)
219253
}
220254

221-
err = s.db.SelectContext(ctx, &t.Members, `
255+
teamMembers := make([]TeamMemberDB, 0)
256+
257+
err = s.db.SelectContext(ctx, &teamMembers, `
222258
SELECT users.user_id, CONCAT(users.first_name, ' ', users.last_name) AS user_name, COALESCE(users.avatar, '') AS avatar, officer.officer_id,
223259
officer.email_alias, officer.name AS officer_name, officer.description AS officer_description,
224260
officer.historywiki_url, officerTeamMembers.start_date, officerTeamMembers.end_date
@@ -243,6 +279,10 @@ func (s *Store) GetTeamByStartEndYearByEmail(ctx context.Context, emailAlias str
243279
return t, fmt.Errorf("failed to get team members by start end year by email: %w", err)
244280
}
245281

282+
for _, teamMember := range teamMembers {
283+
t.Members = append(t.Members, s.TeamMemberDBToTeamMember(teamMember))
284+
}
285+
246286
return t, nil
247287
}
248288

@@ -253,7 +293,9 @@ func (s *Store) GetTeamByStartEndYearByID(ctx context.Context, teamID, startYear
253293
return t, fmt.Errorf("failed to get team by start end year by id: %w", err)
254294
}
255295

256-
err = s.db.SelectContext(ctx, &t.Members, `
296+
teamMembers := make([]TeamMemberDB, 0)
297+
298+
err = s.db.SelectContext(ctx, &teamMembers, `
257299
SELECT users.user_id, CONCAT(users.first_name, ' ', users.last_name) AS user_name, COALESCE(users.avatar, '') AS avatar, officer.officer_id,
258300
officer.email_alias, officer.name AS officer_name, officer.description AS officer_description,
259301
officer.historywiki_url, officerTeamMembers.start_date, officerTeamMembers.end_date
@@ -278,6 +320,10 @@ func (s *Store) GetTeamByStartEndYearByID(ctx context.Context, teamID, startYear
278320
return t, fmt.Errorf("failed to get team members by start end year by id: %w", err)
279321
}
280322

323+
for _, teamMember := range teamMembers {
324+
t.Members = append(t.Members, s.TeamMemberDBToTeamMember(teamMember))
325+
}
326+
281327
return t, nil
282328
}
283329

0 commit comments

Comments
 (0)