From 866a5d88bfafddf7acd1106cc3a5560f66959323 Mon Sep 17 00:00:00 2001 From: Merry-robot Date: Sun, 9 Mar 2025 15:59:42 -0400 Subject: [PATCH 1/5] add MIT --- pkg/database/dto/user.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/database/dto/user.go b/pkg/database/dto/user.go index fa85326d..da280214 100644 --- a/pkg/database/dto/user.go +++ b/pkg/database/dto/user.go @@ -88,6 +88,7 @@ type FacilityStaffResponse struct { Web []*UserResponse `json:"web" yaml:"web" xml:"web"` Instructor []*UserResponse `json:"instructor" yaml:"instructor" xml:"instructor"` Mentor []*UserResponse `json:"mentor" yaml:"mentor" xml:"mentor"` + MIT []*UserResponse `json:"mit" yaml:"mit" xml: "mit"` } func ConvUserToUserResponse(user *models.User) *UserResponse { @@ -305,6 +306,8 @@ func GetStaffResponse() (*FacilityStaffResponse, error) { staff.Instructor = u case "mtr": staff.Mentor = u + case "mit": + staff.MIT = u } } From 7965c998a407ccaefbd9c2714b32f9abed8cdba7 Mon Sep 17 00:00:00 2001 From: Merry-robot Date: Sun, 9 Mar 2025 16:01:21 -0400 Subject: [PATCH 2/5] Update user.go --- pkg/database/dto/user.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/database/dto/user.go b/pkg/database/dto/user.go index da280214..599b8938 100644 --- a/pkg/database/dto/user.go +++ b/pkg/database/dto/user.go @@ -306,9 +306,7 @@ func GetStaffResponse() (*FacilityStaffResponse, error) { staff.Instructor = u case "mtr": staff.Mentor = u - case "mit": - staff.MIT = u - } + } return staff, nil From ffcdf2ae7a4d1e450fd7a81b587b23eb36c49d5d Mon Sep 17 00:00:00 2001 From: Merry-robot Date: Sun, 9 Mar 2025 16:01:38 -0400 Subject: [PATCH 3/5] Add mentor in training role --- pkg/database/dto/user.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/database/dto/user.go b/pkg/database/dto/user.go index 599b8938..da280214 100644 --- a/pkg/database/dto/user.go +++ b/pkg/database/dto/user.go @@ -306,7 +306,9 @@ func GetStaffResponse() (*FacilityStaffResponse, error) { staff.Instructor = u case "mtr": staff.Mentor = u - + case "mit": + staff.MIT = u + } } return staff, nil From 487d76004db954066dcb0a9a63d08511b147256b Mon Sep 17 00:00:00 2001 From: MerryArbitrary <103080686+MerryArbitrary@users.noreply.github.com> Date: Sun, 4 May 2025 13:59:03 -0400 Subject: [PATCH 4/5] Remove MIT Acronym Change to MentorInTraining to align with VATUSA nomenclature --- pkg/database/dto/user.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkg/database/dto/user.go b/pkg/database/dto/user.go index da280214..b009fab4 100644 --- a/pkg/database/dto/user.go +++ b/pkg/database/dto/user.go @@ -77,18 +77,18 @@ type VisitorResponse struct { } type FacilityStaffResponse struct { - ATM []*UserResponse `json:"atm" yaml:"atm" xml:"atm"` - DATM []*UserResponse `json:"datm" yaml:"datm" xml:"datm"` - TA []*UserResponse `json:"ta" yaml:"ta" xml:"ta"` - EC []*UserResponse `json:"ec" yaml:"ec" xml:"ec"` - FE []*UserResponse `json:"fe" yaml:"fe" xml:"fe"` - WM []*UserResponse `json:"wm" yaml:"wm" xml:"wm"` - Events []*UserResponse `json:"events" yaml:"events" xml:"events"` - Facilities []*UserResponse `json:"facilities" yaml:"facilities" xml:"facilities"` - Web []*UserResponse `json:"web" yaml:"web" xml:"web"` - Instructor []*UserResponse `json:"instructor" yaml:"instructor" xml:"instructor"` - Mentor []*UserResponse `json:"mentor" yaml:"mentor" xml:"mentor"` - MIT []*UserResponse `json:"mit" yaml:"mit" xml: "mit"` + ATM []*UserResponse `json:"atm" yaml:"atm" xml:"atm"` + DATM []*UserResponse `json:"datm" yaml:"datm" xml:"datm"` + TA []*UserResponse `json:"ta" yaml:"ta" xml:"ta"` + EC []*UserResponse `json:"ec" yaml:"ec" xml:"ec"` + FE []*UserResponse `json:"fe" yaml:"fe" xml:"fe"` + WM []*UserResponse `json:"wm" yaml:"wm" xml:"wm"` + Events []*UserResponse `json:"events" yaml:"events" xml:"events"` + Facilities []*UserResponse `json:"facilities" yaml:"facilities" xml:"facilities"` + Web []*UserResponse `json:"web" yaml:"web" xml:"web"` + Instructor []*UserResponse `json:"instructor" yaml:"instructor" xml:"instructor"` + Mentor []*UserResponse `json:"mentor" yaml:"mentor" xml:"mentor"` + MentorInTraining []*UserResponse `json:"mit" yaml:"mit" xml: "mit"` } func ConvUserToUserResponse(user *models.User) *UserResponse { @@ -307,7 +307,7 @@ func GetStaffResponse() (*FacilityStaffResponse, error) { case "mtr": staff.Mentor = u case "mit": - staff.MIT = u + staff.MentorInTraining = u } } From b0e73f4abd5b5676139b6a4a628e98eee08499d6 Mon Sep 17 00:00:00 2001 From: MerryArbitrary <103080686+MerryArbitrary@users.noreply.github.com> Date: Tue, 9 Dec 2025 15:00:52 -0500 Subject: [PATCH 5/5] add mit --- pkg/database/dto/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/database/dto/user.go b/pkg/database/dto/user.go index b009fab4..98282b21 100644 --- a/pkg/database/dto/user.go +++ b/pkg/database/dto/user.go @@ -274,7 +274,7 @@ func GetUsersByRole(role string) ([]*UserResponse, error) { } func GetStaffResponse() (*FacilityStaffResponse, error) { - roles := []string{"atm", "datm", "ta", "ec", "fe", "wm", "events", "facilities", "web", "ins", "mtr"} + roles := []string{"atm", "datm", "ta", "ec", "fe", "wm", "events", "facilities", "web", "ins", "mtr","mit"} staff := &FacilityStaffResponse{} for _, role := range roles {