iridium/neko
2
2
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2024-07-24 14:40:50 +12:00
Code Issues Packages Projects Releases Wiki Activity

use custom logger.

Browse Source
This commit is contained in:
Miroslav Šedivý
2021-09-17 00:58:50 +02:00
parent 5a7cdd31fe
commit 8d0fcbde70
15 changed files with 305 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
internal/api/members/bluk.go
View File

@ -14,25 +14,25 @@ type MemberBulkUpdatePayload struct {
Profile types.MemberProfile `json:"profile"`
}
func (h *MembersHandler) membersBulkUpdate(w http.ResponseWriter, r *http.Request) {
func (h *MembersHandler) membersBulkUpdate(w http.ResponseWriter, r *http.Request) error {
bytes, err := io.ReadAll(r.Body)
if err != nil {
utils.HttpBadRequest(w).WithInternalErr(err).Msg("unable to read post body")
return
return utils.HttpBadRequest("unable to read post body").WithInternalErr(err)
}
header := &MemberBulkUpdatePayload{}
if err := json.Unmarshal(bytes, &header); err != nil {
utils.HttpBadRequest(w).WithInternalErr(err).Msg("unable to unmarshal payload")
return
return utils.HttpBadRequest("unable to unmarshal payload").WithInternalErr(err)
}
for _, memberId := range header.IDs {
// TODO: Bulk select?
profile, err := h.members.Select(memberId)
if err != nil {
utils.HttpInternalServerError(w, err).WithInternalMsg("unable to select member profile").Msgf("failed to update member %s", memberId)
return
return utils.HttpInternalServerError().
WithInternalErr(err).
WithInternalMsg("unable to select member profile").
Msgf("failed to update member %s", memberId)
}
body := &MemberBulkUpdatePayload{
@ -40,15 +40,18 @@ func (h *MembersHandler) membersBulkUpdate(w http.ResponseWriter, r *http.Reques
}
if err := json.Unmarshal(bytes, &body); err != nil {
utils.HttpBadRequest(w).WithInternalErr(err).Msgf("unable to unmarshal payload for member %s", memberId)
return
return utils.HttpBadRequest().
WithInternalErr(err).
Msgf("unable to unmarshal payload for member %s", memberId)
}
if err := h.members.UpdateProfile(memberId, body.Profile); err != nil {
utils.HttpInternalServerError(w, err).WithInternalMsg("unable to update member profile").Msgf("failed to update member %s", memberId)
return
return utils.HttpInternalServerError().
WithInternalErr(err).
WithInternalMsg("unable to update member profile").
Msgf("failed to update member %s", memberId)
}
}
utils.HttpSuccess(w)
return utils.HttpSuccess(w)
}

67
internal/api/members/controler.go
View File

@ -24,7 +24,7 @@ type MemberPasswordPayload struct {
Password string `json:"password"`
}
func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) {
func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) error {
limit, err := strconv.Atoi(r.URL.Query().Get("limit"))
if err != nil {
// TODO: Default zero.
@ -39,8 +39,7 @@ func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) {
entries, err := h.members.SelectAll(limit, offset)
if err != nil {
utils.HttpInternalServerError(w, err).Send()
return
return utils.HttpInternalServerError().WithInternalErr(err)
}
members := []MemberDataPayload{}
@ -51,10 +50,10 @@ func (h *MembersHandler) membersList(w http.ResponseWriter, r *http.Request) {
})
}
utils.HttpSuccess(w, members)
return utils.HttpSuccess(w, members)
}
func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) {
func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) error {
data := &MemberCreatePayload{
// default values
Profile: types.MemberProfile{
@ -67,82 +66,76 @@ func (h *MembersHandler) membersCreate(w http.ResponseWriter, r *http.Request) {
},
}
if !utils.HttpJsonRequest(w, r, data) {
return
if err := utils.HttpJsonRequest(w, r, data); err != nil {
return err
}
if data.Username == "" {
utils.HttpBadRequest(w).Msg("username cannot be empty")
return
return utils.HttpBadRequest("username cannot be empty")
}
if data.Password == "" {
utils.HttpBadRequest(w).Msg("password cannot be empty")
return
return utils.HttpBadRequest("password cannot be empty")
}
id, err := h.members.Insert(data.Username, data.Password, data.Profile)
if err != nil {
if errors.Is(err, types.ErrMemberAlreadyExists) {
utils.HttpUnprocessableEntity(w).Msg("member already exists")
} else {
utils.HttpInternalServerError(w, err).Send()
return utils.HttpUnprocessableEntity("member already exists")
}
return
return utils.HttpInternalServerError().WithInternalErr(err)
}
utils.HttpSuccess(w, MemberDataPayload{
return utils.HttpSuccess(w, MemberDataPayload{
ID: id,
Profile: data.Profile,
})
}
func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) {
func (h *MembersHandler) membersRead(w http.ResponseWriter, r *http.Request) error {
member := GetMember(r)
profile := member.Profile
utils.HttpSuccess(w, profile)
return utils.HttpSuccess(w, profile)
}
func (h *MembersHandler) membersUpdateProfile(w http.ResponseWriter, r *http.Request) {
func (h *MembersHandler) membersUpdateProfile(w http.ResponseWriter, r *http.Request) error {
member := GetMember(r)
profile := member.Profile
data := &member.Profile
if !utils.HttpJsonRequest(w, r, &profile) {
return
if err := utils.HttpJsonRequest(w, r, data); err != nil {
return err
}
if err := h.members.UpdateProfile(member.ID, profile); err != nil {
utils.HttpInternalServerError(w, err).Send()
return
if err := h.members.UpdateProfile(member.ID, *data); err != nil {
return utils.HttpInternalServerError().WithInternalErr(err)
}
utils.HttpSuccess(w)
return utils.HttpSuccess(w)
}
func (h *MembersHandler) membersUpdatePassword(w http.ResponseWriter, r *http.Request) {
func (h *MembersHandler) membersUpdatePassword(w http.ResponseWriter, r *http.Request) error {
member := GetMember(r)
data := MemberPasswordPayload{}
data := &MemberPasswordPayload{}
if !utils.HttpJsonRequest(w, r, &data) {
return
if err := utils.HttpJsonRequest(w, r, data); err != nil {
return err
}
if err := h.members.UpdatePassword(member.ID, data.Password); err != nil {
utils.HttpInternalServerError(w, err).Send()
return
return utils.HttpInternalServerError().WithInternalErr(err)
}
utils.HttpSuccess(w)
return utils.HttpSuccess(w)
}
func (h *MembersHandler) membersDelete(w http.ResponseWriter, r *http.Request) {
func (h *MembersHandler) membersDelete(w http.ResponseWriter, r *http.Request) error {
member := GetMember(r)
if err := h.members.Delete(member.ID); err != nil {
utils.HttpInternalServerError(w, err).Send()
return
return utils.HttpInternalServerError().WithInternalErr(err)
}
utils.HttpSuccess(w)
return utils.HttpSuccess(w)
}

45
internal/api/members/handler.go
View File

@ -30,12 +30,12 @@ func New(
}
}
func (h *MembersHandler) Route(r chi.Router) {
func (h *MembersHandler) Route(r types.Router) {
r.Get("/", h.membersList)
r.With(auth.AdminsOnly).Group(func(r chi.Router) {
r.With(auth.AdminsOnly).Group(func(r types.Router) {
r.Post("/", h.membersCreate)
r.With(h.ExtractMember).Route("/{memberId}", func(r chi.Router) {
r.With(h.ExtractMember).Route("/{memberId}", func(r types.Router) {
r.Get("/", h.membersRead)
r.Post("/", h.membersUpdateProfile)
r.Post("/password", h.membersUpdatePassword)
@ -44,8 +44,8 @@ func (h *MembersHandler) Route(r chi.Router) {
})
}
func (h *MembersHandler) RouteBulk(r chi.Router) {
r.With(auth.AdminsOnly).Group(func(r chi.Router) {
func (h *MembersHandler) RouteBulk(r types.Router) {
r.With(auth.AdminsOnly).Group(func(r types.Router) {
r.Post("/update", h.membersBulkUpdate)
})
}
@ -55,33 +55,28 @@ type MemberData struct {
Profile types.MemberProfile
}
func SetMember(r *http.Request, session MemberData) *http.Request {
ctx := context.WithValue(r.Context(), keyMemberCtx, session)
return r.WithContext(ctx)
func SetMember(r *http.Request, session MemberData) context.Context {
return context.WithValue(r.Context(), keyMemberCtx, session)
}
func GetMember(r *http.Request) MemberData {
return r.Context().Value(keyMemberCtx).(MemberData)
}
func (h *MembersHandler) ExtractMember(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
memberId := chi.URLParam(r, "memberId")
func (h *MembersHandler) ExtractMember(w http.ResponseWriter, r *http.Request) (context.Context, error) {
memberId := chi.URLParam(r, "memberId")
profile, err := h.members.Select(memberId)
if err != nil {
if errors.Is(err, types.ErrMemberDoesNotExist) {
utils.HttpNotFound(w).Msg("member not found")
} else {
utils.HttpInternalServerError(w, err).Send()
}
return
profile, err := h.members.Select(memberId)
if err != nil {
if errors.Is(err, types.ErrMemberDoesNotExist) {
return nil, utils.HttpNotFound("member not found")
}
next.ServeHTTP(w, SetMember(r, MemberData{
ID: memberId,
Profile: profile,
}))
})
return nil, utils.HttpInternalServerError().WithInternalErr(err)
}
return SetMember(r, MemberData{
ID: memberId,
Profile: profile,
}), nil
}