feat(authN): Add to all DB entries 'Modified_by'... (#81)

Add metadata for user Add tests
cloudoperators · Sep 26, 2024 · 419e412 · 419e412
1 parent cb2f9c1
commit 419e412
Show file tree

Hide file tree

Showing 59 changed files with 12,771 additions and 4,129 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
@@ -15,6 +15,18 @@ import (
 )
 
 // add custom models here
+func getModelMetadata(em entity.Metadata) *Metadata {
+	createdAt := em.CreatedAt.String()
+	deletedAt := em.DeletedAt.String()
+	updatedAt := em.UpdatedAt.String()
+	return &Metadata{
+		CreatedAt: &createdAt,
+		CreatedBy: &em.CreatedBy,
+		DeletedAt: &deletedAt,
+		UpdatedAt: &updatedAt,
+		UpdatedBy: &em.UpdatedBy,
+	}
+}
 
 func NewPageInfo(p *entity.PageInfo) *PageInfo {
 	if p == nil {
@@ -219,7 +231,7 @@ func NewIssueMatchEntity(im *IssueMatchInput) entity.IssueMatch {
 		IssueId:               issueId,
 		ComponentInstanceId:   ciId,
 		UserId:                userId,
-		Info:                  entity.Info{CreatedAt: createdAt},
+		Metadata:              entity.Metadata{CreatedAt: createdAt},
 	}
 }
 
@@ -320,6 +332,7 @@ func NewUser(user *entity.User) User {
 		UniqueUserID: &user.UniqueUserID,
 		Name:         &user.Name,
 		Type:         int(user.Type),
+		Metadata:     getModelMetadata(user.Metadata),
 	}
 }
 
@@ -364,6 +377,7 @@ func NewActivity(activity *entity.Activity) Activity {
 	return Activity{
 		ID:     fmt.Sprintf("%d", activity.Id),
 		Status: &status,
+		//Metadata: activity.getModelMetadata(activitiy),
 	}
 }
 

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/user/listUsers.graphql b/internal/api/graphql/graph/queryCollection/user/listUsers.graphql
@@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
+# SPDX-License-Identifier: Apache-2.0
+
+query ($filter: UserFilter, $first: Int, $after: String) {
+    Users (
+        filter: $filter,
+        first: $first,
+        after: $after
+    ) {
+        totalCount
+        edges {
+            node {
+                id
+                name
+                type
+                metadata {
+                    created_at
+                    created_by
+                    deleted_at
+                    updated_at
+                    updated_by
+                }
+            }
+            cursor
+        }
+    }
+}
diff --git a/internal/api/graphql/graph/resolver/activity.go b/internal/api/graphql/graph/resolver/activity.go
diff --git a/internal/api/graphql/graph/resolver/component.go b/internal/api/graphql/graph/resolver/component.go
diff --git a/internal/api/graphql/graph/resolver/component_instance.go b/internal/api/graphql/graph/resolver/component_instance.go
diff --git a/internal/api/graphql/graph/resolver/component_version.go b/internal/api/graphql/graph/resolver/component_version.go
diff --git a/internal/api/graphql/graph/resolver/evidence.go b/internal/api/graphql/graph/resolver/evidence.go
diff --git a/internal/api/graphql/graph/resolver/issue.go b/internal/api/graphql/graph/resolver/issue.go
diff --git a/internal/api/graphql/graph/resolver/issue_match.go b/internal/api/graphql/graph/resolver/issue_match.go
diff --git a/internal/api/graphql/graph/resolver/issue_match_change.go b/internal/api/graphql/graph/resolver/issue_match_change.go
diff --git a/internal/api/graphql/graph/resolver/issue_match_filter_value.go b/internal/api/graphql/graph/resolver/issue_match_filter_value.go
diff --git a/internal/api/graphql/graph/resolver/issue_repository.go b/internal/api/graphql/graph/resolver/issue_repository.go
diff --git a/internal/api/graphql/graph/resolver/issue_variant.go b/internal/api/graphql/graph/resolver/issue_variant.go
diff --git a/internal/api/graphql/graph/resolver/mutation.go b/internal/api/graphql/graph/resolver/mutation.go
diff --git a/internal/api/graphql/graph/resolver/query.go b/internal/api/graphql/graph/resolver/query.go
diff --git a/internal/api/graphql/graph/resolver/service.go b/internal/api/graphql/graph/resolver/service.go
diff --git a/internal/api/graphql/graph/resolver/service_filter.go b/internal/api/graphql/graph/resolver/service_filter.go
diff --git a/internal/api/graphql/graph/resolver/support_group.go b/internal/api/graphql/graph/resolver/support_group.go
diff --git a/internal/api/graphql/graph/resolver/user.go b/internal/api/graphql/graph/resolver/user.go
diff --git a/internal/api/graphql/graph/schema/common.graphqls b/internal/api/graphql/graph/schema/common.graphqls
@@ -104,4 +104,12 @@ type FilterItem {
     displayName: String
     filterName: String
     values: [String]
-}
+}
+
+type Metadata {
+    created_at: DateTime
+    created_by: String
+    deleted_at: DateTime
+    updated_at: DateTime
+    updated_by: String
+}
diff --git a/internal/api/graphql/graph/schema/user.graphqls b/internal/api/graphql/graph/schema/user.graphqls
@@ -8,6 +8,7 @@ type User implements Node {
     name: String
     supportGroups(filter: SupportGroupFilter, first: Int, after: String): SupportGroupConnection
     services(filter: ServiceFilter, first: Int, after: String): ServiceConnection
+    metadata: Metadata
 }
 
 input UserInput {

diff --git a/internal/app/user/user_handler.go b/internal/app/user/user_handler.go
@@ -103,6 +103,7 @@ func (u *userHandler) ListUsers(filter *entity.UserFilter, options *entity.ListO
 }
 
 func (u *userHandler) CreateUser(user *entity.User) (*entity.User, error) {
+	user.CreatedBy = "Creator"
 	f := &entity.UserFilter{
 		UniqueUserID: []*string{&user.UniqueUserID},
 	}
@@ -136,6 +137,7 @@ func (u *userHandler) CreateUser(user *entity.User) (*entity.User, error) {
 }
 
 func (u *userHandler) UpdateUser(user *entity.User) (*entity.User, error) {
+	user.UpdatedBy = "Updater"
 	l := logrus.WithFields(logrus.Fields{
 		"event":  UpdateUserEventName,
 		"object": user,