Integrated changes in codegen

Ed-Fi-Alliance-OSS · Oct 28, 2023 · 94957f4 · 94957f4
1 parent 4cd2a33
commit 94957f4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/...Std_4.0.0_Artifacts_MsSql_Data_Security_0002-ResourceClaimMetadata_generated.approved.sql b/...Std_4.0.0_Artifacts_MsSql_Data_Security_0002-ResourceClaimMetadata_generated.approved.sql
@@ -867,7 +867,7 @@ BEGIN
 
     INSERT [dbo].[ResourceClaims] ([ResourceName], [ClaimName], [ParentResourceClaimId])
     VALUES (N'educationOrganizationNetworkAssociation', N'http://ed-fi.org/ods/identity/claims/educationOrganizationNetworkAssociation',
-@educationOrganizationsResourceClaimId);
+@relationshipBasedDataResourceClaimId);
 
 END
 

diff --git a/...Std_4.0.0_Artifacts_PgSql_Data_Security_0002-ResourceClaimMetadata_generated.approved.sql b/...Std_4.0.0_Artifacts_PgSql_Data_Security_0002-ResourceClaimMetadata_generated.approved.sql
@@ -486,7 +486,7 @@ begin
 
     IF NOT EXISTS(SELECT 1 FROM dbo.ResourceClaims WHERE ResourceName ='educationOrganizationNetworkAssociation') THEN
     insert into dbo.ResourceClaims (ResourceName, ClaimName, ParentResourceClaimId)
-    values ('educationOrganizationNetworkAssociation', 'http://ed-fi.org/ods/identity/claims/educationOrganizationNetworkAssociation', educationOrganizationsResourceClaimId);
+    values ('educationOrganizationNetworkAssociation', 'http://ed-fi.org/ods/identity/claims/educationOrganizationNetworkAssociation', relationshipBasedDataResourceClaimId);
     END IF;
 
     IF NOT EXISTS(SELECT 1 FROM dbo.ResourceClaims WHERE ResourceName ='educationOrganizationPeerAssociation') THEN

diff --git a/...Std_5.0.0_Artifacts_MsSql_Data_Security_0002-ResourceClaimMetadata_generated.approved.sql b/...Std_5.0.0_Artifacts_MsSql_Data_Security_0002-ResourceClaimMetadata_generated.approved.sql
@@ -876,7 +876,7 @@ BEGIN
 
     INSERT [dbo].[ResourceClaims] ([ResourceName], [ClaimName], [ParentResourceClaimId])
     VALUES (N'educationOrganizationNetworkAssociation', N'http://ed-fi.org/ods/identity/claims/educationOrganizationNetworkAssociation',
-@educationOrganizationsResourceClaimId);
+@relationshipBasedDataResourceClaimId);
 
 END
 

diff --git a/...Std_5.0.0_Artifacts_PgSql_Data_Security_0002-ResourceClaimMetadata_generated.approved.sql b/...Std_5.0.0_Artifacts_PgSql_Data_Security_0002-ResourceClaimMetadata_generated.approved.sql
@@ -491,7 +491,7 @@ begin
 
     IF NOT EXISTS(SELECT 1 FROM dbo.ResourceClaims WHERE ResourceName ='educationOrganizationNetworkAssociation') THEN
     insert into dbo.ResourceClaims (ResourceName, ClaimName, ParentResourceClaimId)
-    values ('educationOrganizationNetworkAssociation', 'http://ed-fi.org/ods/identity/claims/educationOrganizationNetworkAssociation', educationOrganizationsResourceClaimId);
+    values ('educationOrganizationNetworkAssociation', 'http://ed-fi.org/ods/identity/claims/educationOrganizationNetworkAssociation', relationshipBasedDataResourceClaimId);
     END IF;
 
     IF NOT EXISTS(SELECT 1 FROM dbo.ResourceClaims WHERE ResourceName ='educationOrganizationPeerAssociation') THEN

diff --git a/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Generators/ResourceClaimMetadata.cs b/Utilities/CodeGeneration/EdFi.Ods.CodeGen/Generators/ResourceClaimMetadata.cs
@@ -15,6 +15,7 @@ namespace EdFi.Ods.CodeGen.Generators
     public class ResourceClaimMetadata : GeneratorBase
     {
         private IPersonEntitySpecification _personEntitySpecification;
+        private IEducationOrganizationEntitySpecification _educationOrganizationEntitySpecification;
 
         protected override object Build()
         {
@@ -25,6 +26,11 @@ protected override object Build()
                     new PersonTypesProvider(
                         new SuppliedDomainModelProvider(domainModel)));
 
+            _educationOrganizationEntitySpecification =
+                new EducationOrganizationEntitySpecification(
+                    new EducationOrganizationTypesProvider(
+                        new SuppliedDomainModelProvider(domainModel)));
+
             var orderedAggregates = domainModel
                 .Entities
                 .Where(x => x.IsAggregateRoot && !x.IsAbstract)
@@ -58,7 +64,7 @@ private string GetParentResource(Entity entity)
                     : "systemDescriptors";
             }
 
-            if (EducationOrganizationEntitySpecification.IsEducationOrganizationEntity(resourceName))
+            if (_educationOrganizationEntitySpecification.IsEducationOrganizationEntity(resourceName))
             {
                 return "educationOrganizations";
             }