feat(authN) - Add updated_by to inserts #360 (#410)

Add assignments in app handlers
Add inserts in database querries
Adjust tests

go.mod

@@ -22,6 +22,7 @@ require (
 	github.com/samber/lo v1.47.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.10.0
+	github.com/vektah/gqlparser/v2 v2.5.19
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
 	k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
 )
@@ -85,7 +86,6 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/urfave/cli/v2 v2.27.5 // indirect
-	github.com/vektah/gqlparser/v2 v2.5.19 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
 	go.opentelemetry.io/otel v1.24.0 // indirect

internal/app/activity/activity_handler.go

@@ -143,6 +143,7 @@ func (a *activityHandler) CreateActivity(activity *entity.Activity) (*entity.Act
 		l.Error(err)
 		return nil, NewActivityHandlerError("Internal error while creating activity (GetUserId).")
 	}
+	activity.UpdatedBy = activity.CreatedBy
 
 	newActivity, err := a.database.CreateActivity(activity)
 

internal/app/component/component_handler.go

@@ -121,6 +121,7 @@ func (cs *componentHandler) CreateComponent(component *entity.Component) (*entit
 		l.Error(err)
 		return nil, NewUserHandlerError("Internal error while creating component (GetUserId).")
 	}
+	component.UpdatedBy = component.CreatedBy
 
 	components, err := cs.ListComponents(f, &entity.ListOptions{})
 

internal/app/component_instance/component_instance_handler.go

@@ -122,6 +122,7 @@ func (ci *componentInstanceHandler) CreateComponentInstance(componentInstance *e
 		l.Error(err)
 		return nil, NewComponentInstanceHandlerError("Internal error while creating componentInstance (GetUserId).")
 	}
+	componentInstance.UpdatedBy = componentInstance.CreatedBy
 
 	newComponentInstance, err := ci.database.CreateComponentInstance(componentInstance)
 

internal/app/component_version/component_version_handler.go

@@ -120,6 +120,7 @@ func (cv *componentVersionHandler) CreateComponentVersion(componentVersion *enti
 		l.Error(err)
 		return nil, NewComponentVersionHandlerError("Internal error while creating componentVersion (GetUserId).")
 	}
+	componentVersion.UpdatedBy = componentVersion.CreatedBy
 
 	newComponent, err := cv.database.CreateComponentVersion(componentVersion)
 

internal/app/evidence/evidence_handler.go

@@ -115,6 +115,7 @@ func (e *evidenceHandler) CreateEvidence(evidence *entity.Evidence) (*entity.Evi
 		l.Error(err)
 		return nil, NewEvidenceHandlerError("Internal error while creating evidence (GetUserId).")
 	}
+	evidence.UpdatedBy = evidence.CreatedBy
 
 	newEvidence, err := e.database.CreateEvidence(evidence)
 

internal/app/issue/issue_handler.go

@@ -176,6 +176,7 @@ func (is *issueHandler) CreateIssue(issue *entity.Issue) (*entity.Issue, error)
 		l.Error(err)
 		return nil, NewIssueHandlerError("Internal error while creating issue (GetUserId).")
 	}
+	issue.UpdatedBy = issue.CreatedBy
 
 	issues, err := is.ListIssues(f, &entity.IssueListOptions{})
 

internal/app/issue_match/issue_match_handler.go

@@ -147,6 +147,7 @@ func (im *issueMatchHandler) CreateIssueMatch(issueMatch *entity.IssueMatch) (*e
 		l.Error(err)
 		return nil, NewIssueMatchHandlerError("Internal error while retrieving effective severity (GetUserId).")
 	}
+	issueMatch.UpdatedBy = issueMatch.CreatedBy
 
 	severityFilter := &entity.SeverityFilter{
 		IssueId: []*int64{&issueMatch.IssueId},

internal/app/issue_match_change/issue_match_change_handler.go

@@ -119,6 +119,7 @@ func (imc *issueMatchChangeHandler) CreateIssueMatchChange(issueMatchChange *ent
 		l.Error(err)
 		return nil, NewIssueMatchChangeHandlerError("Internal error while creating issueMatchChange (GetUserId).")
 	}
+	issueMatchChange.UpdatedBy = issueMatchChange.CreatedBy
 
 	newIssueMatchChange, err := imc.database.CreateIssueMatchChange(issueMatchChange)
 

internal/app/issue_repository/issue_repository_handler.go

@@ -118,6 +118,7 @@ func (ir *issueRepositoryHandler) CreateIssueRepository(issueRepository *entity.
 		l.Error(err)
 		return nil, NewIssueRepositoryHandlerError("Internal error while creating issueRepository (GetUserId).")
 	}
+	issueRepository.BaseIssueRepository.UpdatedBy = issueRepository.BaseIssueRepository.CreatedBy
 
 	issueRepositories, err := ir.ListIssueRepositories(f, &entity.ListOptions{})
 

internal/app/issue_variant/issue_variant_handler.go

@@ -184,6 +184,7 @@ func (iv *issueVariantHandler) CreateIssueVariant(issueVariant *entity.IssueVari
 		l.Error(err)
 		return nil, NewIssueVariantHandlerError("Internal error while creating issueVariant (GetUserId).")
 	}
+	issueVariant.UpdatedBy = issueVariant.CreatedBy
 
 	issueVariants, err := iv.ListIssueVariants(f, &entity.ListOptions{})
 

internal/app/service/service_handler.go

@@ -170,6 +170,7 @@ func (s *serviceHandler) CreateService(service *entity.Service) (*entity.Service
 		l.Error(err)
 		return nil, NewServiceHandlerError("Internal error while creating service (GetUserId).")
 	}
+	service.BaseService.UpdatedBy = service.BaseService.CreatedBy
 
 	services, err := s.ListServices(f, &entity.ListOptions{})
 

internal/app/support_group/support_group_handler.go

@@ -148,6 +148,7 @@ func (sg *supportGroupHandler) CreateSupportGroup(supportGroup *entity.SupportGr
 		l.Error(err)
 		return nil, NewSupportGroupHandlerError("Internal error while creating supportGroup (GetUserId).")
 	}
+	supportGroup.UpdatedBy = supportGroup.CreatedBy
 
 	supportGroups, err := sg.ListSupportGroups(f, &entity.ListOptions{})
 

internal/app/user/user_handler.go

@@ -118,6 +118,7 @@ func (u *userHandler) CreateUser(user *entity.User) (*entity.User, error) {
 		l.Error(err)
 		return nil, NewUserHandlerError("Internal error while creating user (GetUserId).")
 	}
+	user.UpdatedBy = user.CreatedBy
 
 	users, err := u.ListUsers(f, &entity.ListOptions{})
 

internal/database/mariadb/activity.go

@@ -212,10 +212,12 @@ func (s *SqlDatabase) CreateActivity(activity *entity.Activity) (*entity.Activit
 	query := `
 		INSERT INTO Activity (
 			activity_status,
-			activity_created_by
+			activity_created_by,
+			activity_updated_by
 		) VALUES (
 			:activity_status,
-			:activity_created_by
+			:activity_created_by,
+			:activity_updated_by
 		)
 	`
 

internal/database/mariadb/component.go

@@ -206,11 +206,13 @@ func (s *SqlDatabase) CreateComponent(component *entity.Component) (*entity.Comp
 		INSERT INTO Component (
 			component_ccrn,
 			component_type,
-			component_created_by
+			component_created_by,
+			component_updated_by
 		) VALUES (
 			:component_ccrn,
 			:component_type,
-			:component_created_by
+			:component_created_by,
+			:component_updated_by
 		)
 	`
 

internal/database/mariadb/component_instance.go

@@ -228,13 +228,15 @@ func (s *SqlDatabase) CreateComponentInstance(componentInstance *entity.Componen
 			componentinstance_count,
 			componentinstance_component_version_id,
 			componentinstance_service_id,
-			componentinstance_created_by
+			componentinstance_created_by,
+			componentinstance_updated_by
 		) VALUES (
 			:componentinstance_ccrn,
 			:componentinstance_count,
 			:componentinstance_component_version_id,
 			:componentinstance_service_id,
-			:componentinstance_created_by
+			:componentinstance_created_by,
+			:componentinstance_updated_by
 		)
 	`
 

internal/database/mariadb/component_version.go

@@ -213,11 +213,13 @@ func (s *SqlDatabase) CreateComponentVersion(componentVersion *entity.ComponentV
 		INSERT INTO ComponentVersion (
 			componentversion_component_id,
 			componentversion_version,
-			componentversion_created_by
+			componentversion_created_by,
+			componentversion_updated_by
 		) VALUES (
 			:componentversion_component_id,
 			:componentversion_version,
-			:componentversion_created_by
+			:componentversion_created_by,
+			:componentversion_updated_by
 		)
 	`
 

internal/database/mariadb/evidence.go

@@ -224,7 +224,8 @@ func (s *SqlDatabase) CreateEvidence(evidence *entity.Evidence) (*entity.Evidenc
 			evidence_vector,
 			evidence_rating,
 			evidence_raa_end,
-			evidence_created_by
+			evidence_created_by,
+			evidence_updated_by
 		) VALUES (
 			:evidence_author_id,
 			:evidence_activity_id,
@@ -233,7 +234,8 @@ func (s *SqlDatabase) CreateEvidence(evidence *entity.Evidence) (*entity.Evidenc
 			:evidence_vector,
 			:evidence_rating,
 			:evidence_raa_end,
-			:evidence_created_by
+			:evidence_created_by,
+			:evidence_updated_by
 		)
 	`
 

internal/database/mariadb/issue.go

@@ -408,12 +408,14 @@ func (s *SqlDatabase) CreateIssue(issue *entity.Issue) (*entity.Issue, error) {
 			issue_primary_name,
 			issue_type,
 			issue_description,
-			issue_created_by
+			issue_created_by,
+			issue_updated_by
 		) VALUES (
 			:issue_primary_name,
 			:issue_type,
 			:issue_description,
-			:issue_created_by
+			:issue_created_by,
+			:issue_updated_by
 		)
 	`
 

internal/database/mariadb/issue_match.go

@@ -274,7 +274,8 @@ func (s *SqlDatabase) CreateIssueMatch(issueMatch *entity.IssueMatch) (*entity.I
 			issuematch_user_id,
 			issuematch_component_instance_id,
 			issuematch_issue_id,
-			issuematch_created_by
+			issuematch_created_by,
+			issuematch_updated_by
 		) VALUES (
 			:issuematch_status,
 			:issuematch_remediation_date,
@@ -284,7 +285,8 @@ func (s *SqlDatabase) CreateIssueMatch(issueMatch *entity.IssueMatch) (*entity.I
 			:issuematch_user_id,
 			:issuematch_component_instance_id,
 			:issuematch_issue_id,
-			:issuematch_created_by
+			:issuematch_created_by,
+			:issuematch_updated_by
 		)
 	`
 

internal/database/mariadb/issue_match_change.go

@@ -185,12 +185,14 @@ func (s *SqlDatabase) CreateIssueMatchChange(imc *entity.IssueMatchChange) (*ent
 			issuematchchange_action,
 			issuematchchange_activity_id,
 			issuematchchange_issue_match_id,
-			issuematchchange_created_by
+			issuematchchange_created_by,
+			issuematchchange_updated_by
 		) VALUES (
 			:issuematchchange_action,
 			:issuematchchange_activity_id,
 			:issuematchchange_issue_match_id,
-			:issuematchchange_created_by
+			:issuematchchange_created_by,
+			:issuematchchange_updated_by
 		)
 	`
 

internal/database/mariadb/issue_repository.go

@@ -222,11 +222,13 @@ func (s *SqlDatabase) CreateIssueRepository(issueRepository *entity.IssueReposit
 		INSERT INTO IssueRepository (
 			issuerepository_name,
 			issuerepository_url,
-			issuerepository_created_by
+			issuerepository_created_by,
+			issuerepository_updated_by
 		) VALUES (
 			:issuerepository_name,
 			:issuerepository_url,
-			:issuerepository_created_by
+			:issuerepository_created_by,
+			:issuerepository_updated_by
 		)
 	`
 

internal/database/mariadb/issue_variant.go

@@ -247,15 +247,17 @@ func (s *SqlDatabase) CreateIssueVariant(issueVariant *entity.IssueVariant) (*en
 			issuevariant_rating,
 			issuevariant_secondary_name,
 			issuevariant_description,
-			issuevariant_created_by
+			issuevariant_created_by,
+			issuevariant_updated_by
 		) VALUES (
 			:issuevariant_issue_id,
 			:issuevariant_repository_id,
 			:issuevariant_vector,
 			:issuevariant_rating,
 			:issuevariant_secondary_name,
 			:issuevariant_description,
-			:issuevariant_created_by
+			:issuevariant_created_by,
+			:issuevariant_updated_by
 		)
 	`
 

internal/database/mariadb/service.go

@@ -345,10 +345,12 @@ func (s *SqlDatabase) CreateService(service *entity.Service) (*entity.Service, e
 	query := `
 		INSERT INTO Service (
 			service_ccrn,
-			service_created_by
+			service_created_by,
+			service_updated_by
 		) VALUES (
 			:service_ccrn,
-			:service_created_by
+			:service_created_by,
+			:service_updated_by
 		)
 	`
 

internal/database/mariadb/support_group.go

@@ -210,10 +210,12 @@ func (s *SqlDatabase) CreateSupportGroup(supportGroup *entity.SupportGroup) (*en
 	query := `
 		INSERT INTO SupportGroup (
 			supportgroup_ccrn,
-			supportgroup_created_by
+			supportgroup_created_by,
+			supportgroup_updated_by
 		) VALUES (
 			:supportgroup_ccrn,
-			:supportgroup_created_by
+			:supportgroup_created_by,
+			:supportgroup_updated_by
 		)
 	`
 

internal/database/mariadb/user.go

@@ -223,12 +223,14 @@ func (s *SqlDatabase) CreateUser(user *entity.User) (*entity.User, error) {
 			user_name,
 			user_unique_user_id,
 			user_type,
-			user_created_by
+			user_created_by,
+			user_updated_by
 		) VALUES (
 			:user_name,
 			:user_unique_user_id,
 			:user_type,
-			:user_created_by
+			:user_created_by,
+			:user_updated_by
 		)
 	`
 

internal/e2e/metadata_test.go

@@ -74,7 +74,7 @@ var _ = Describe("Creating and updating entity via API", Label("e2e", "Entities"
 			createTestIssue(cfg.Port)
 			issue = getTestIssue(cfg.Port)
 		})
-		It("shall assign CreatedBy and CreatedAt metadata fields and shall keep nil in UpdatedBy, UpdatedAt and DeltedAt metadata fields", func() {
+		It("shall assign CreatedBy, CreatedAt, UpdatedBy and UpdatedAt metadata fields and shall keep nil in DeltedAt metadata fields", func() {
 			Expect(*issue.Description).To(Equal(testCreatedIssueDescription))
 			Expect(issue.Type.String()).To(Equal(testCreatedIssueType))
 
@@ -85,7 +85,7 @@ var _ = Describe("Creating and updating entity via API", Label("e2e", "Entities"
 			Expect(err).Should(BeNil())
 			Expect(createdAt).Should(BeTemporally("~", time.Now().UTC(), 3*time.Second))
 
-			Expect(*issue.Metadata.UpdatedBy).To(Equal(fmt.Sprintf("%d", e2e_common.EmptyUserId)))
+			Expect(*issue.Metadata.UpdatedBy).To(Equal(fmt.Sprintf("%d", e2e_common.SystemUserId)))
 
 			updatedAt, err := time.Parse(dbDateLayout, *issue.Metadata.UpdatedAt)
 			Expect(err).Should(BeNil())