Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ mail/mail-queue

# .DS_Store files
.DS_Store

# Ignoring database dump files
*.dump
22 changes: 14 additions & 8 deletions models/auth.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package models

import (
"strings"

v "github.com/go-ozzo/ozzo-validation/v4"
"github.com/go-ozzo/ozzo-validation/v4/is"
)
Expand All @@ -9,8 +11,9 @@ type CheckEmailRequest struct {
Email string `json:"email"`
}

func (s CheckEmailRequest) Validate() error {
return v.ValidateStruct(&s,
func (s *CheckEmailRequest) Validate() error {
s.Email = strings.ToLower(s.Email)
return v.ValidateStruct(s,
v.Field(&s.Email, v.Required, is.Email),
)
}
Expand All @@ -26,8 +29,9 @@ type StudentOnboardingRequest struct {
CollegeCity string `json:"college_city"`
}

func (s StudentOnboardingRequest) Validate() error {
return v.ValidateStruct(&s,
func (s *StudentOnboardingRequest) Validate() error {
s.Email = strings.ToLower(s.Email)
return v.ValidateStruct(s,
v.Field(&s.Name, v.Required, v.Length(3, 50)),
v.Field(&s.Email, v.Required, is.Email),
v.Field(&s.Password, v.Required, v.Length(8, 0)),
Expand All @@ -42,8 +46,9 @@ type LoginRequest struct {
HashedPassword string `json:"password"`
}

func (l LoginRequest) Validate() error {
return v.ValidateStruct(&l,
func (l *LoginRequest) Validate() error {
l.Email = strings.ToLower(l.Email)
return v.ValidateStruct(l,
v.Field(&l.Email, v.Required, is.Email),
v.Field(&l.HashedPassword, v.Required))
}
Expand All @@ -63,8 +68,9 @@ type ForgetPasswordRequest struct {
NewPassword string `json:"new_password"`
}

func (f ForgetPasswordRequest) Validate() error {
return v.ValidateStruct(&f,
func (f *ForgetPasswordRequest) Validate() error {
f.Email = strings.ToLower(f.Email)
return v.ValidateStruct(f,
v.Field(&f.Email, v.Required, is.Email),
v.Field(&f.NewPassword, v.Required, v.Length(8, 0)))
}
7 changes: 5 additions & 2 deletions models/dispute.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package models

import (
"strings"

v "github.com/go-ozzo/ozzo-validation/v4"
"github.com/go-ozzo/ozzo-validation/v4/is"
)
Expand All @@ -10,8 +12,9 @@ type UpdateDisputeStatusInput struct {
Description string `json:"description"`
}

func (u UpdateDisputeStatusInput) Validate() error {
if err := v.ValidateStruct(&u,
func (u *UpdateDisputeStatusInput) Validate() error {
u.StudentEmail = strings.ToLower(u.StudentEmail)
if err := v.ValidateStruct(u,
v.Field(&u.StudentEmail, is.Email),
v.Field(&u.Description),
); err != nil {
Expand Down
12 changes: 8 additions & 4 deletions models/organizer.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package models

import (
"strings"

v "github.com/go-ozzo/ozzo-validation/v4"
"github.com/go-ozzo/ozzo-validation/v4/is"
)
Expand All @@ -15,8 +17,9 @@ type CreateOrganizerRequest struct {
FacultyHead string `json:"faculty_head"`
}

func (r CreateOrganizerRequest) Validate() error {
return v.ValidateStruct(&r,
func (r *CreateOrganizerRequest) Validate() error {
r.Email = strings.ToLower(r.Email)
return v.ValidateStruct(r,

// Required fields
v.Field(&r.Name, v.Required, v.RuneLength(3, 100)),
Expand All @@ -40,8 +43,9 @@ type EditOrganizerRequest struct {
FacultyHead string `json:"faculty_head"`
}

func (r EditOrganizerRequest) Validate() error {
return v.ValidateStruct(&r,
func (r *EditOrganizerRequest) Validate() error {
r.Email = strings.ToLower(r.Email)
return v.ValidateStruct(r,

v.Field(&r.Name, v.Required, v.RuneLength(3, 100)),
v.Field(&r.Email, v.Required, is.Email),
Expand Down
15 changes: 11 additions & 4 deletions models/people.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package models

import (
"regexp"
"strings"

v "github.com/go-ozzo/ozzo-validation/v4"
"github.com/go-ozzo/ozzo-validation/v4/is"
Expand All @@ -14,8 +15,11 @@ type CreateNewPerson struct {
Email *string `json:"email"`
}

func (p CreateNewPerson) Validate() error {
return v.ValidateStruct(&p,
func (p *CreateNewPerson) Validate() error {
if p.Email != nil {
*p.Email = strings.ToLower(*p.Email)
}
return v.ValidateStruct(p,
v.Field(&p.Name, v.Required, v.Length(2, 100)),
v.Field(&p.PhoneNumber, v.Required,
v.Match(regexp.MustCompile(`^[0-9]{10}$`))),
Expand All @@ -36,8 +40,11 @@ type UpdatePersonEventRequest struct {
Email *string `json:"email"`
}

func (p UpdatePersonEventRequest) Validate() error {
return v.ValidateStruct(&p,
func (p *UpdatePersonEventRequest) Validate() error {
if p.Email != nil {
*p.Email = strings.ToLower(*p.Email)
}
return v.ValidateStruct(p,
v.Field(&p.Name, v.When(
p.Name != "",
v.Length(2, 100),
Expand Down
9 changes: 7 additions & 2 deletions models/team.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package models

import (
"strings"

v "github.com/go-ozzo/ozzo-validation/v4"
"github.com/go-ozzo/ozzo-validation/v4/is"
)
Expand All @@ -24,8 +26,11 @@ func (t TeamMember) Validate() error {
)
}

func (e TeamBookingRequest) Validate() error {
return v.ValidateStruct(&e,
func (e *TeamBookingRequest) Validate() error {
for i := range e.TeamMembers {
e.TeamMembers[i].StudentEmail = strings.ToLower(e.TeamMembers[i].StudentEmail)
}
return v.ValidateStruct(e,
v.Field(&e.TeamName, v.Required, v.Length(2, 100)),
v.Field(&e.TeamMembers,
v.Length(0, 100),
Expand Down
4 changes: 3 additions & 1 deletion pkg/grab_email.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package pkg
import (
"fmt"
"net/http"
"strings"

"github.com/gin-gonic/gin"
)
Expand All @@ -18,6 +19,7 @@ func GrabEmail(c *gin.Context, route string) (string, bool) {

return "", false
}
emailLowercase := strings.ToLower(email)

return email, true
return emailLowercase, true
}
Loading