[HOTFIX] Add notification response to details (#3452)

* add notificationResponse in details * make lint happy * remove unnecessary state calculations * fix state check for BI flow * renaming * adjust PR version
kyma-incubator · Nov 8, 2023 · 0c3ec4a · 0c3ec4a
1 parent 7623ee7
commit 0c3ec4a
Show file tree

Hide file tree

Showing 17 changed files with 537 additions and 266 deletions.
diff --git a/chart/compass/values.yaml b/chart/compass/values.yaml
@@ -167,8 +167,8 @@ global:
       version: "v20231106-af7a300a"
       name: compass-pairing-adapter
     director:
-      dir: prod/incubator/
-      version: "v20231106-bc43757b"
+      dir: dev/incubator/
+      version: "PR-3452"
       name: compass-director
     hydrator:
       dir: prod/incubator/

diff --git a/components/director/internal/domain/formationassignment/automock/fa_notification_service.go b/components/director/internal/domain/formationassignment/automock/fa_notification_service.go
diff --git a/components/director/internal/domain/formationassignment/automock/status_service.go b/components/director/internal/domain/formationassignment/automock/status_service.go
diff --git a/components/director/internal/domain/formationassignment/fixtures_test.go b/components/director/internal/domain/formationassignment/fixtures_test.go
@@ -4,6 +4,8 @@ import (
 	"database/sql"
 	"encoding/json"
 
+	"github.com/kyma-incubator/compass/components/director/internal/domain/statusreport"
+
 	"k8s.io/utils/strings/slices"
 
 	"github.com/kyma-incubator/compass/components/director/pkg/str"
@@ -784,7 +786,7 @@ func fixNotificationRequestAndReverseRequest(objectID, object2ID string, partici
 	return []*webhookclient.FormationAssignmentNotificationRequest{request, requestReverse}, templateInput, templateInputReverse
 }
 
-func fixNotificationStatusReturnedDetails(resourceType model.ResourceType, resourceSubtype string, fa, reverseFa *model.FormationAssignment, location formationconstraint.JoinPointLocation, lastFormationAssignmentState, lastFormationAssignmentConfig, tenantID string) *formationconstraint.NotificationStatusReturnedOperationDetails {
+func fixNotificationStatusReturnedDetails(resourceType model.ResourceType, resourceSubtype string, fa, reverseFa *model.FormationAssignment, location formationconstraint.JoinPointLocation, lastFormationAssignmentState, lastFormationAssignmentConfig, tenantID string, notificationStatusReport *statusreport.NotificationStatusReport) *formationconstraint.NotificationStatusReturnedOperationDetails {
 	return &formationconstraint.NotificationStatusReturnedOperationDetails{
 		ResourceType:                         resourceType,
 		ResourceSubtype:                      resourceSubtype,
@@ -795,6 +797,7 @@ func fixNotificationStatusReturnedDetails(resourceType model.ResourceType, resou
 		ReverseFormationAssignment:           reverseFa,
 		LastFormationAssignmentState:         lastFormationAssignmentState,
 		LastFormationAssignmentConfiguration: lastFormationAssignmentConfig,
+		NotificationStatusReport:             notificationStatusReport,
 		Formation:                            formation,
 	}
 }
@@ -858,3 +861,15 @@ func convertFormationAssignmentFromModel(formationAssignment *model.FormationAss
 		Error:       str.StringifyJSONRawMessage(formationAssignment.Error),
 	}
 }
+
+func fixNotificationStatusReport() *statusreport.NotificationStatusReport {
+	return statusreport.NewNotificationStatusReport(TestConfigValueRawJSON, readyState, "")
+}
+
+func fixNotificationStatusReportWithStateAndConfig(configuration json.RawMessage, state string) *statusreport.NotificationStatusReport {
+	return statusreport.NewNotificationStatusReport(configuration, state, "")
+}
+
+func fixNotificationStatusReportWithStateAndError(state, errorMessage string) *statusreport.NotificationStatusReport {
+	return statusreport.NewNotificationStatusReport(nil, state, errorMessage)
+}
diff --git a/components/director/internal/domain/formationassignment/notifications.go b/components/director/internal/domain/formationassignment/notifications.go
@@ -3,6 +3,8 @@ package formationassignment
 import (
 	"context"
 
+	"github.com/kyma-incubator/compass/components/director/internal/domain/statusreport"
+
 	"github.com/kyma-incubator/compass/components/director/pkg/str"
 
 	"github.com/kyma-incubator/compass/components/director/pkg/formationconstraint"
@@ -94,7 +96,7 @@ func (fan *formationAssignmentNotificationService) GenerateFormationAssignmentNo
 }
 
 // PrepareDetailsForNotificationStatusReturned creates NotificationStatusReturnedOperationDetails by given tenantID, formation assignment and formation operation
-func (fan *formationAssignmentNotificationService) PrepareDetailsForNotificationStatusReturned(ctx context.Context, tenantID string, fa *model.FormationAssignment, operation model.FormationOperation, lastFormationAssignmentState, lastFormationAssignmentConfiguration string) (*formationconstraint.NotificationStatusReturnedOperationDetails, error) {
+func (fan *formationAssignmentNotificationService) PrepareDetailsForNotificationStatusReturned(ctx context.Context, tenantID string, fa *model.FormationAssignment, operation model.FormationOperation, lastFormationAssignmentState, lastFormationAssignmentConfiguration string, notificationStatusReport *statusreport.NotificationStatusReport) (*formationconstraint.NotificationStatusReturnedOperationDetails, error) {
 	var targetType model.ResourceType
 	switch fa.TargetType {
 	case model.FormationAssignmentTypeApplication:
@@ -138,6 +140,7 @@ func (fan *formationAssignmentNotificationService) PrepareDetailsForNotification
 	return &formationconstraint.NotificationStatusReturnedOperationDetails{
 		ResourceType:                         targetType,
 		ResourceSubtype:                      targetSubtype,
+		NotificationStatusReport:             notificationStatusReport,
 		LastFormationAssignmentState:         lastFormationAssignmentState,
 		LastFormationAssignmentConfiguration: lastFormationAssignmentConfiguration,
 		Tenant:                               tenantID,