feat(remediation): user id is set for remediation

internal/app/common/user_id.go

@@ -31,6 +31,23 @@ func GetCurrentUserId(ctx context.Context, db database.Database) (int64, error)
 	}
 }
 
+func GetCurrentUniqueUserId(ctx context.Context) (string, error) {
+	if authentication_context.IsAuthenticationRequired(ctx) {
+		uniqueUserId, err := authentication_context.UserNameFromContext(ctx)
+		if err != nil {
+			return "", fmt.Errorf("Could not get user name from context: %w", err)
+		}
+
+		return uniqueUserId, nil
+	} else {
+		return systemUserUniqueUserId, nil
+	}
+}
+
+func GetUserIdByUniqueId(ctx context.Context, db database.Database, uniqueUserId string) (int64, error) {
+	return getUserIdFromDb(db, uniqueUserId)
+}
+
 func getUserIdFromDb(db database.Database, uniqueUserId string) (int64, error) {
 	filter := &entity.UserFilter{UniqueUserID: []*string{&uniqueUserId}}
 	ids, err := db.GetAllUserIds(filter)

internal/app/remediation/remediation_handler.go

@@ -142,10 +142,34 @@ func (rh *remediationHandler) CreateRemediation(ctx context.Context, remediation
 		applog.LogError(rh.logger, wrappedErr, logrus.Fields{
 			"remediation": remediation,
 		})
+
 		return nil, wrappedErr
 	}
+
 	remediation.UpdatedBy = remediation.CreatedBy
 
+	if remediation.RemediatedBy == "" {
+		remediation.RemediatedBy, err = common.GetCurrentUniqueUserId(ctx)
+		if err != nil {
+			wrappedErr := appErrors.InternalError(string(op), "Remediation", "", err)
+			applog.LogError(rh.logger, wrappedErr, logrus.Fields{
+				"remediation": remediation,
+			})
+
+			return nil, wrappedErr
+		}
+	}
+
+	remediation.RemediatedById, err = common.GetUserIdByUniqueId(ctx, rh.database, remediation.RemediatedBy)
+	if err != nil {
+		wrappedErr := appErrors.InternalError(string(op), "Remediation", "", err)
+		applog.LogError(rh.logger, wrappedErr, logrus.Fields{
+			"remediation": remediation,
+		})
+
+		return nil, wrappedErr
+	}
+
 	newRemediation, err := rh.database.CreateRemediation(remediation)
 	if err != nil {
 		// Generic database error

internal/e2e/common/user.go

@@ -20,8 +20,8 @@ import (
 )
 
 var (
-	systemUserName         = "systemuser"
-	systemUserUniqueUserId = "S0000000"
+	SystemUserName         = "systemuser"
+	SystemUserUniqueUserId = "S0000000"
 )
 
 type Number interface {
@@ -34,37 +34,37 @@ func SubtractSystemUsers[T Number](n T) T {
 
 func SubtractSystemUserName(v []*string) []*string {
 	return lo.Filter(v, func(val *string, _ int) bool {
-		return val == nil || *val != systemUserName
+		return val == nil || *val != SystemUserName
 	})
 }
 
 func SubtractSystemUserNameFromValueItems(v []*model.ValueItem) []*model.ValueItem {
 	return lo.Filter(v, func(val *model.ValueItem, _ int) bool {
-		return val == nil || *val.Value != systemUserUniqueUserId
+		return val == nil || *val.Value != SystemUserUniqueUserId
 	})
 }
 
 func SubtractSystemUserUniqueUserId(v []*string) []*string {
 	return lo.Filter(v, func(val *string, _ int) bool {
-		return val == nil || *val != systemUserUniqueUserId
+		return val == nil || *val != SystemUserUniqueUserId
 	})
 }
 
 func SubtractSystemUserUniqueUserIdVL(v []string) []string {
 	return lo.Filter(v, func(val string, _ int) bool {
-		return val != systemUserUniqueUserId
+		return val != SystemUserUniqueUserId
 	})
 }
 
 func SubtractSystemUserNameVL(v []string) []string {
 	return lo.Filter(v, func(val string, _ int) bool {
-		return val != systemUserName
+		return val != SystemUserName
 	})
 }
 
 func SubtractSystemUsersEntity(v []entity.UserResult) []entity.UserResult {
 	return lo.Filter(v, func(val entity.UserResult, _ int) bool {
-		return val.User.UniqueUserID != systemUserUniqueUserId
+		return val.User.UniqueUserID != SystemUserUniqueUserId
 	})
 }
 

internal/e2e/remediation_query_test.go

@@ -164,7 +164,6 @@ var _ = Describe("Creating Remediation via API", Label("e2e", "Remediations"), f
 							"vulnerability":   remediation.Issue,
 							"remediationDate": remediation.RemediationDate.Format(time.RFC3339),
 							"expirationDate":  remediation.ExpirationDate.Format(time.RFC3339),
-							"remediatedBy":    remediation.RemediatedBy,
 						},
 					})
 
@@ -174,7 +173,7 @@ var _ = Describe("Creating Remediation via API", Label("e2e", "Remediations"), f
 				Expect(*respData.Remediation.Service).To(Equal(remediation.Service))
 				Expect(*respData.Remediation.Vulnerability).To(Equal(remediation.Issue))
 				Expect(*respData.Remediation.Image).To(Equal(remediation.Component))
-				Expect(*respData.Remediation.RemediatedBy).To(Equal(remediation.RemediatedBy))
+				Expect(*respData.Remediation.RemediatedBy).To(Equal(e2e_common.SystemUserUniqueUserId))
 				Expect(*respData.Remediation.RemediationDate).To(Equal(remediation.RemediationDate.Format(time.RFC3339)))
 				Expect(*respData.Remediation.ExpirationDate).To(Equal(remediation.ExpirationDate.Format(time.RFC3339)))
 			})