refactor: update function name, update struct type

Author: Bikram-ghuku

controllers/oauth.go

@@ -83,7 +83,7 @@ func OAuth(w http.ResponseWriter, r *http.Request) {
 
 	// Check if the user is a organiser
 
-	isOrganiser := utils.CheckUserOrgs(accessToken, userInfo.Username)
+	isOrganiser := utils.IsUserExecutive(accessToken, userInfo.Username)
 	if isOrganiser {
 
 		jwtString, err := utils.GenerateLoginJwtString(utils.LoginJwtFields{

controllers/organiser.go

@@ -20,17 +20,9 @@ type AcceptRejectProject struct {
 }
 
 type ProjectOrg struct {
-	Id              uint     `json:"id"`
-	Name            string   `json:"name"`
-	Description     string   `json:"description"`
-	Tags            []string `json:"tags"`
-	RepoLink        string   `json:"repo_link"`
-	CommChannel     string   `json:"comm_channel"`
-	ReadmeLink      string   `json:"readme_link"`
-	Mentor          Mentor   `json:"mentor"`
-	SecondaryMentor Mentor   `json:"secondary_mentor"`
-	ProjectStatus   bool     `json:"project_status"`
-	StatusRemark    string   `json:"status_remark"`
+	ProjectStatus bool   `json:"project_status"`
+	StatusRemark  string `json:"status_remark"`
+	Project
 }
 
 func newProjectOrg(dbProject *models.Project) ProjectOrg {
@@ -40,17 +32,19 @@ func newProjectOrg(dbProject *models.Project) ProjectOrg {
 	}
 
 	return ProjectOrg{
-		Id:              dbProject.ID,
-		Name:            dbProject.Name,
-		Description:     dbProject.Description,
-		Tags:            tags,
-		RepoLink:        dbProject.RepoLink,
-		CommChannel:     dbProject.CommChannel,
-		ReadmeLink:      dbProject.ReadmeLink,
-		Mentor:          newMentor(&dbProject.Mentor),
-		SecondaryMentor: newMentor(&dbProject.SecondaryMentor),
-		ProjectStatus:   dbProject.ProjectStatus,
-		StatusRemark:    dbProject.StatusRemark,
+		Project: Project{
+			Id:              dbProject.ID,
+			Name:            dbProject.Name,
+			Description:     dbProject.Description,
+			Tags:            tags,
+			RepoLink:        dbProject.RepoLink,
+			CommChannel:     dbProject.CommChannel,
+			ReadmeLink:      dbProject.ReadmeLink,
+			Mentor:          newMentor(&dbProject.Mentor),
+			SecondaryMentor: newMentor(&dbProject.SecondaryMentor),
+		},
+		ProjectStatus: dbProject.ProjectStatus,
+		StatusRemark:  dbProject.StatusRemark,
 	}
 }
 

utils/oauth.go

@@ -130,7 +130,7 @@ func GetOauthUserInfo(accessToken string) (*GHUserInfo, error) {
 	return &userInfo, nil
 }
 
-func CheckUserOrgs(accessToken string, username string) bool {
+func IsUserExecutive(accessToken string, username string) bool {
 
 	client := http.Client{}
 	url := fmt.Sprintf("https://api.github.com/orgs/kossiitkgp/teams/executies/memberships/%s", username)