feat(authN): change SapID to UniqueUserId (#85) (#93)

* feat(authN): change SapID to UniqueUserId (#85) Change name of variable SapId to UniqueUserId Add user Type variable to distinguish technical user and human user * Automatic application of license header --------- Co-authored-by: License Bot <[email protected]> Co-authored-by: David Rochow <[email protected]> Co-authored-by: Michael Reimsbach <[email protected]>
cloudoperators · Aug 6, 2024 · 1d15c77 · 1d15c77
1 parent d009eb7
commit 1d15c77
Show file tree

Hide file tree

Showing 26 changed files with 397 additions and 131 deletions.
diff --git a/internal/api/graphql/graph/generated.go b/internal/api/graphql/graph/generated.go
diff --git a/internal/api/graphql/graph/model/models.go b/internal/api/graphql/graph/model/models.go
@@ -316,16 +316,18 @@ func NewIssueVariantEntity(issueVariant *IssueVariantInput) entity.IssueVariant
 
 func NewUser(user *entity.User) User {
 	return User{
-		ID:    fmt.Sprintf("%d", user.Id),
-		SapID: &user.SapID,
-		Name:  &user.Name,
+		ID:           fmt.Sprintf("%d", user.Id),
+		UniqueUserID: &user.UniqueUserID,
+		Name:         &user.Name,
+		Type:         int(user.Type),
 	}
 }
 
 func NewUserEntity(user *UserInput) entity.User {
 	return entity.User{
-		Name:  lo.FromPtr(user.Name),
-		SapID: lo.FromPtr(user.SapID),
+		Name:         lo.FromPtr(user.Name),
+		UniqueUserID: lo.FromPtr(user.UniqueUserID),
+		Type:         entity.GetUserTypeFromString(lo.FromPtr(user.Type)),
 	}
 }
 

diff --git a/internal/api/graphql/graph/model/models_gen.go b/internal/api/graphql/graph/model/models_gen.go
diff --git a/internal/api/graphql/graph/queryCollection/activity/full.graphql b/internal/api/graphql/graph/queryCollection/activity/full.graphql
@@ -23,7 +23,8 @@ query ($filter: ActivityFilter, $first: Int, $after: String) {
                                 edges {
                                     node {
                                         id
-                                        sapID
+                                        uniqueUserId
+                                        type
                                         name
                                     }
                                     cursor
@@ -165,7 +166,8 @@ query ($filter: ActivityFilter, $first: Int, $after: String) {
                             description
                             author {
                                 id
-                                sapID
+                                uniqueUserId
+                                type
                                 name
                             }
                             activity {
@@ -260,4 +262,4 @@ query ($filter: ActivityFilter, $first: Int, $after: String) {
             nextPageAfter
         }
     }
-}
+}