Skip to content

Commit b4f4bb5

Browse files
author
Mateo Ivankovic
committed
fix linter issues
1 parent e3147b7 commit b4f4bb5

File tree

2 files changed

+94
-91
lines changed

2 files changed

+94
-91
lines changed

‎server/src/api/users.go‎

Lines changed: 78 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,97 @@
11
package api
22

33
import (
4-
"github.com/go-chi/chi/v5"
5-
"net/http"
6-
"scrumlr.io/server/users"
7-
8-
"github.com/go-chi/render"
9-
"github.com/google/uuid"
10-
"go.opentelemetry.io/otel/codes"
11-
"scrumlr.io/server/common"
12-
"scrumlr.io/server/identifiers"
13-
"scrumlr.io/server/logger"
14-
"scrumlr.io/server/sessions"
4+
"github.com/go-chi/chi/v5"
5+
"net/http"
6+
"scrumlr.io/server/users"
7+
8+
"github.com/go-chi/render"
9+
"github.com/google/uuid"
10+
"go.opentelemetry.io/otel/codes"
11+
"scrumlr.io/server/common"
12+
"scrumlr.io/server/identifiers"
13+
"scrumlr.io/server/logger"
14+
"scrumlr.io/server/sessions"
1515
)
1616

1717
//var tracer trace.Tracer = otel.Tracer("scrumlr.io/server/api")
1818

1919
// getUser get a user
2020
func (s *Server) getUser(w http.ResponseWriter, r *http.Request) {
21-
ctx, span := tracer.Start(r.Context(), "scrumlr.users.api.get")
22-
defer span.End()
21+
ctx, span := tracer.Start(r.Context(), "scrumlr.users.api.get")
22+
defer span.End()
2323

24-
userId := ctx.Value(identifiers.UserIdentifier).(uuid.UUID)
24+
userId := ctx.Value(identifiers.UserIdentifier).(uuid.UUID)
2525

26-
user, err := s.users.Get(ctx, userId)
27-
if err != nil {
28-
span.SetStatus(codes.Error, "failed to get user")
29-
span.RecordError(err)
30-
common.Throw(w, r, err)
31-
return
32-
}
26+
user, err := s.users.Get(ctx, userId)
27+
if err != nil {
28+
span.SetStatus(codes.Error, "failed to get user")
29+
span.RecordError(err)
30+
common.Throw(w, r, err)
31+
return
32+
}
3333

34-
render.Status(r, http.StatusOK)
35-
render.Respond(w, r, user)
34+
render.Status(r, http.StatusOK)
35+
render.Respond(w, r, user)
3636
}
3737

3838
func (s *Server) getUserByID(w http.ResponseWriter, r *http.Request) {
39-
//callerId := r.Context().Value(identifiers.UserIdentifier).(uuid.UUID)
40-
41-
userParam := chi.URLParam(r, "user")
42-
requestedUserId, err := uuid.Parse(userParam)
43-
user, err := s.users.Get(r.Context(), requestedUserId)
44-
if err != nil {
45-
common.Throw(w, r, err)
46-
return
47-
}
48-
49-
render.Status(r, http.StatusOK)
50-
render.Respond(w, r, user)
39+
//callerId := r.Context().Value(identifiers.UserIdentifier).(uuid.UUID)
40+
41+
userParam := chi.URLParam(r, "user")
42+
requestedUserId, err := uuid.Parse(userParam)
43+
if err != nil {
44+
common.Throw(w, r, err)
45+
}
46+
user, err := s.users.Get(r.Context(), requestedUserId)
47+
if err != nil {
48+
common.Throw(w, r, err)
49+
return
50+
}
51+
52+
render.Status(r, http.StatusOK)
53+
render.Respond(w, r, user)
5154
}
5255

5356
func (s *Server) updateUser(w http.ResponseWriter, r *http.Request) {
54-
ctx, span := tracer.Start(r.Context(), "scrumlr.users.api.update")
55-
defer span.End()
56-
log := logger.FromContext(ctx)
57-
58-
user := ctx.Value(identifiers.UserIdentifier).(uuid.UUID)
59-
60-
var body users.UserUpdateRequest
61-
if err := render.Decode(r, &body); err != nil {
62-
span.SetStatus(codes.Error, "unable to decode body")
63-
span.RecordError(err)
64-
log.Errorw("unable to decode body", "err", err)
65-
common.Throw(w, r, common.BadRequestError(err))
66-
return
67-
}
68-
69-
body.ID = user
70-
71-
updatedUser, err := s.users.Update(ctx, body)
72-
if err != nil {
73-
span.SetStatus(codes.Error, "failed to update user")
74-
span.RecordError(err)
75-
common.Throw(w, r, common.InternalServerError)
76-
return
77-
}
78-
79-
// because of a import cycle the boards are updated through the session service
80-
// after a user update.
81-
updateBoards := sessions.BoardSessionUpdateRequest{
82-
User: user,
83-
}
84-
85-
_, err = s.sessions.UpdateUserBoards(ctx, updateBoards)
86-
if err != nil {
87-
span.SetStatus(codes.Error, "failed to update user board")
88-
span.RecordError(err)
89-
log.Errorw("Unable to update user boards")
90-
}
91-
92-
render.Status(r, http.StatusOK)
93-
render.Respond(w, r, updatedUser)
57+
ctx, span := tracer.Start(r.Context(), "scrumlr.users.api.update")
58+
defer span.End()
59+
log := logger.FromContext(ctx)
60+
61+
user := ctx.Value(identifiers.UserIdentifier).(uuid.UUID)
62+
63+
var body users.UserUpdateRequest
64+
if err := render.Decode(r, &body); err != nil {
65+
span.SetStatus(codes.Error, "unable to decode body")
66+
span.RecordError(err)
67+
log.Errorw("unable to decode body", "err", err)
68+
common.Throw(w, r, common.BadRequestError(err))
69+
return
70+
}
71+
72+
body.ID = user
73+
74+
updatedUser, err := s.users.Update(ctx, body)
75+
if err != nil {
76+
span.SetStatus(codes.Error, "failed to update user")
77+
span.RecordError(err)
78+
common.Throw(w, r, common.InternalServerError)
79+
return
80+
}
81+
82+
// because of a import cycle the boards are updated through the session service
83+
// after a user update.
84+
updateBoards := sessions.BoardSessionUpdateRequest{
85+
User: user,
86+
}
87+
88+
_, err = s.sessions.UpdateUserBoards(ctx, updateBoards)
89+
if err != nil {
90+
span.SetStatus(codes.Error, "failed to update user board")
91+
span.RecordError(err)
92+
log.Errorw("Unable to update user boards")
93+
}
94+
95+
render.Status(r, http.StatusOK)
96+
render.Respond(w, r, updatedUser)
9497
}

‎server/src/feedback/type.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
package feedback
22

33
import (
4-
"encoding/json"
5-
"errors"
4+
"encoding/json"
5+
"errors"
66
)
77

88
type FeedbackType string
99

1010
const (
11-
BugReport FeedbackType = "BUG_REPORT"
12-
FeatureRequest FeedbackType = "FEATURE_REQUEST"
13-
Praise FeedbackType = "PRAISE"
11+
BugReport FeedbackType = "BUG_REPORT"
12+
FeatureRequest FeedbackType = "FEATURE_REQUEST"
13+
Praise FeedbackType = "PRAISE"
1414
)
1515

1616
func (feedbackType *FeedbackType) UnmarshalJSON(b []byte) error {
17-
var s string
18-
if err := json.Unmarshal(b, &s); err != nil {
19-
return err
20-
}
17+
var s string
18+
if err := json.Unmarshal(b, &s); err != nil {
19+
return err
20+
}
2121

22-
unmarshalledFeedbackType := FeedbackType(s)
23-
switch unmarshalledFeedbackType {
24-
case Praise, BugReport, FeatureRequest:
25-
*feedbackType = unmarshalledFeedbackType
26-
return nil
27-
}
22+
unmarshalledFeedbackType := FeedbackType(s)
23+
switch unmarshalledFeedbackType {
24+
case Praise, BugReport, FeatureRequest:
25+
*feedbackType = unmarshalledFeedbackType
26+
return nil
27+
}
2828

29-
return errors.New("Invalid feedback type")
29+
return errors.New("invalid feedback type")
3030
}

0 commit comments

Comments
 (0)