[NOREF] Add CEDAR System UUID (#2599)

* Add CEDAR System UUID * Make uuid nullable * Added log for failed UUID parse * Set uuid to nil if failed to parse
CMS-Enterprise · May 23, 2024 · d4e73c9 · d4e73c9
1 parent d511928
commit d4e73c9
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 0 deletions.
diff --git a/pkg/cedar/core/system_summary.go b/pkg/cedar/core/system_summary.go
@@ -4,7 +4,9 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/google/uuid"
 	"github.com/guregu/null/zero"
+	"go.uber.org/zap"
 
 	"github.com/cmsgov/easi-app/pkg/appcontext"
 	"github.com/cmsgov/easi-app/pkg/apperrors"
@@ -67,6 +69,14 @@ func (c *Client) GetSystemSummary(ctx context.Context, opts ...systemSummaryPara
 	// Populate the SystemSummary field by converting each item in resp.Payload.SystemSummary
 	for _, sys := range resp.Payload.SystemSummary {
 		if sys.IctObjectID != nil {
+			uuid, uErr := uuid.Parse(sys.UUID)
+			uuidString := zero.StringFrom(uuid.String())
+			// errors in parsing shouldn't stop the process, but we should log when it happens
+			if uErr != nil {
+				appcontext.ZLogger(ctx).Warn("failed to parse System UUID", zap.String("cedarUUID", sys.UUID))
+				uuidString = zero.StringFromPtr(nil)
+			}
+
 			cedarSys := &models.CedarSystem{
 				VersionID:               zero.StringFromPtr(sys.ID),
 				Name:                    zero.StringFromPtr(sys.Name),
@@ -78,6 +88,7 @@ func (c *Client) GetSystemSummary(ctx context.Context, opts ...systemSummaryPara
 				SystemMaintainerOrg:     zero.StringFrom(sys.SystemMaintainerOrg),
 				SystemMaintainerOrgComp: zero.StringFrom(sys.SystemMaintainerOrgComp),
 				ID:                      zero.StringFromPtr(sys.IctObjectID),
+				UUID:                    uuidString,
 			}
 			retVal = append(retVal, cedarSys)
 		}

diff --git a/pkg/graph/generated/generated.go b/pkg/graph/generated/generated.go
diff --git a/pkg/graph/schema.graphql b/pkg/graph/schema.graphql
@@ -182,6 +182,7 @@ type CedarSystem {
   isBookmarked: Boolean!
   linkedTrbRequests: [TRBRequest!]!
   linkedSystemIntakes: [SystemIntake!]! 
+  uuid: String
 }
 
 """

diff --git a/pkg/local/cedarcoremock/system_summary.go b/pkg/local/cedarcoremock/system_summary.go
@@ -22,6 +22,7 @@ var mockSystems = map[string]*models.CedarSystem{
 		BusinessOwnerOrgComp:    zero.StringFrom("IST"),
 		SystemMaintainerOrg:     zero.StringFrom("Division of Quality Assurance"),
 		SystemMaintainerOrgComp: zero.StringFrom("DQA"),
+		UUID:                    zero.StringFrom("f5172597-1f9d-4930-9db1-a565a2994c61"),
 	},
 	"{11AB1A00-1234-5678-ABC1-1A001B00CC1B}": {
 		ID:                      zero.StringFrom("{11AB1A00-1234-5678-ABC1-1A001B00CC1B}"),
@@ -34,6 +35,7 @@ var mockSystems = map[string]*models.CedarSystem{
 		BusinessOwnerOrgComp:    zero.StringFrom("IST"),
 		SystemMaintainerOrg:     zero.StringFrom("Division of Quality Assurance"),
 		SystemMaintainerOrgComp: zero.StringFrom("DQA"),
+		UUID:                    zero.StringFrom("44feed75-a837-4fe6-94f2-f9d24e56697b"),
 	},
 	"{11AB1A00-1234-5678-ABC1-1A001B00CC2C}": {
 		ID:                      zero.StringFrom("{11AB1A00-1234-5678-ABC1-1A001B00CC2C}"),
@@ -46,6 +48,7 @@ var mockSystems = map[string]*models.CedarSystem{
 		BusinessOwnerOrgComp:    zero.StringFrom("IST"),
 		SystemMaintainerOrg:     zero.StringFrom("Division of Quality Assurance"),
 		SystemMaintainerOrgComp: zero.StringFrom("DQA"),
+		UUID:                    zero.StringFrom("81b4638f-fbb3-4bb0-a0a4-d16f03eb8cc0"),
 	},
 	"{11AB1A00-1234-5678-ABC1-1A001B00CC3D}": {
 		ID:                      zero.StringFrom("{11AB1A00-1234-5678-ABC1-1A001B00CC3D}"),
@@ -58,6 +61,7 @@ var mockSystems = map[string]*models.CedarSystem{
 		BusinessOwnerOrgComp:    zero.StringFrom("MMM"),
 		SystemMaintainerOrg:     zero.StringFrom("Division of Divisive Divergence"),
 		SystemMaintainerOrgComp: zero.StringFrom("DODD"),
+		UUID:                    zero.StringFrom("3d167844-8f36-49f4-a5d7-8c55c9d7621c"),
 	},
 	"{11AB1A00-1234-5678-ABC1-1A001B00CC4E}": {
 		ID:                      zero.StringFrom("{11AB1A00-1234-5678-ABC1-1A001B00CC4E}"),
@@ -70,6 +74,7 @@ var mockSystems = map[string]*models.CedarSystem{
 		BusinessOwnerOrgComp:    zero.StringFrom("MMM"),
 		SystemMaintainerOrg:     zero.StringFrom("Division of Divisive Divergence"),
 		SystemMaintainerOrgComp: zero.StringFrom("DODD"),
+		UUID:                    zero.StringFrom("46434d7c-5193-4a9d-82b1-0c4d3ceb4237"),
 	},
 }
 

diff --git a/pkg/models/cedar_system.go b/pkg/models/cedar_system.go
@@ -16,6 +16,7 @@ type CedarSystem struct {
 	SystemMaintainerOrg     zero.String `json:"systemMaintainerOrg"`
 	SystemMaintainerOrgComp zero.String `json:"systemMaintainerOrgComp"`
 	VersionID               zero.String `json:"versionId"`
+	UUID                    zero.String `json:"uuid"`
 }
 
 // CedarSubSystem is the model for a sub system that comes back from the CEDAR Core API

diff --git a/src/data/mock/systemProfile.ts b/src/data/mock/systemProfile.ts
@@ -690,6 +690,7 @@ export const result: { data: GetSystemProfile } = {
         businessOwnerOrgComp: 'OC',
         systemMaintainerOrg: 'Web and Emerging Technologies Group',
         systemMaintainerOrgComp: 'OC',
+        uuid: '0ab8fafa-6857-497b-87c1-e054d732bd5d',
         __typename: 'CedarSystem'
       },
       deployments: [

diff --git a/src/queries/GetSystemProfileQuery.ts b/src/queries/GetSystemProfileQuery.ts
@@ -120,6 +120,7 @@ export default gql`
         businessOwnerOrgComp
         systemMaintainerOrg
         systemMaintainerOrgComp
+        uuid
       }
       deployments {
         id

diff --git a/src/queries/types/GetSystemProfile.ts b/src/queries/types/GetSystemProfile.ts
@@ -131,6 +131,7 @@ export interface GetSystemProfile_cedarSystemDetails_cedarSystem {
   businessOwnerOrgComp: string | null;
   systemMaintainerOrg: string | null;
   systemMaintainerOrgComp: string | null;
+  uuid: string | null;
 }
 
 export interface GetSystemProfile_cedarSystemDetails_deployments_dataCenter {