Merge pull request #4381 from nickmango/bug/lfid-auth-gerrit

[#4348]Bug/User Fetch unmarshalling
communitybridge · Jul 10, 2024 · 536b294 · 536b294
2 parents d9d5d64 + 01e9b60
commit 536b294
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 17 deletions.
diff --git a/cla-backend-go/users/models.go b/cla-backend-go/users/models.go
@@ -5,20 +5,24 @@ package users
 
 // DBUser data model
 type DBUser struct {
-	UserID             string   `json:"user_id"`
-	UserExternalID     string   `json:"user_external_id"`
-	LFEmail            string   `json:"lf_email"`
-	Admin              bool     `json:"admin"`
-	LFUsername         string   `json:"lf_username"`
-	DateCreated        string   `json:"date_created"`
-	DateModified       string   `json:"date_modified"`
-	UserName           string   `json:"user_name"`
-	Version            string   `json:"version"`
-	UserEmails         []string `json:"user_emails"`
-	UserGithubID       string   `json:"user_github_id"`
-	UserGithubUsername string   `json:"user_github_username"`
-	UserGitlabID       string   `json:"user_gitlab_id"`
-	UserGitlabUsername string   `json:"user_gitlab_username"`
-	UserCompanyID      string   `json:"user_company_id"`
-	Note               string   `json:"note"`
+	UserID             string     `json:"user_id"`
+	UserExternalID     string     `json:"user_external_id"`
+	LFEmail            string     `json:"lf_email"`
+	Admin              bool       `json:"admin"`
+	LFUsername         string     `json:"lf_username"`
+	DateCreated        string     `json:"date_created"`
+	DateModified       string     `json:"date_modified"`
+	UserName           string     `json:"user_name"`
+	Version            string     `json:"version"`
+	UserEmails         UserEmails `json:"user_emails"`
+	UserGithubID       string     `json:"user_github_id"`
+	UserGithubUsername string     `json:"user_github_username"`
+	UserGitlabID       string     `json:"user_gitlab_id"`
+	UserGitlabUsername string     `json:"user_gitlab_username"`
+	UserCompanyID      string     `json:"user_company_id"`
+	Note               string     `json:"note"`
+}
+
+type UserEmails struct {
+	SS []string `json:"SS"`
 }
diff --git a/cla-backend-go/users/repository.go b/cla-backend-go/users/repository.go
@@ -560,6 +560,8 @@ func (repo repository) GetUserByLFUserName(lfUserName string) (*models.User, err
 		return nil, err
 	}
 
+	log.WithFields(f).Debugf("result: %+v", result.Items)
+
 	// The user model
 	var dbUserModels []DBUser
 
@@ -1252,6 +1254,11 @@ func (repo repository) UpdateUserCompanyID(userID, companyID, note string) error
 
 // convertDBUserModel translates a dyanamoDB data model into a service response model
 func convertDBUserModel(user DBUser) *models.User {
+	var emails []string
+	if user.UserEmails.SS != nil {
+		emails = user.UserEmails.SS
+	}
+
 	return &models.User{
 		UserID:         user.UserID,
 		UserExternalID: user.UserExternalID,
@@ -1262,7 +1269,7 @@ func convertDBUserModel(user DBUser) *models.User {
 		DateModified:   user.DateModified,
 		Username:       user.UserName,
 		Version:        user.Version,
-		Emails:         user.UserEmails,
+		Emails:         emails,
 		GithubID:       user.UserGithubID,
 		GithubUsername: user.UserGithubUsername,
 		GitlabID:       user.UserGitlabID,