Skip to content

Commit

Permalink
Merge pull request #57 from Sundae-Shop-Consulting/feature/namespace-…
Browse files Browse the repository at this point in the history
…injection

Add namespace injection to DLRS config
  • Loading branch information
lmeerkatz authored Aug 9, 2024
2 parents cb907c9 + 3b6feb1 commit df2c3f7
Show file tree
Hide file tree
Showing 23 changed files with 83 additions and 72 deletions.
21 changes: 16 additions & 5 deletions cumulusci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,35 @@ project:


flows:
dev_org:
config_with_data:
steps:
10:
1:
task: deploy_dlrs
11:
2:
task: assign_permission_sets
options:
api_names:
- VolunteerManager
12:
3:
task: load_dataset
options:
mapping: datasets/mapping.yml
sql_path: datasets/sample-animalshelter.sql
drop_missing_schema: True
13:
4:
task: reorder_app_menu

dev_org:
steps:
10:
flow: config_with_data

install_beta:
steps:
10:
flow: config_with_data


make_community:
steps:
1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ private class dlrs_VolunteerActivityAssignmentTest
private static void testTrigger()
{
// Force the dlrs_VolunteerActivityAssignmentTrigger to be invoked, fails the test if org config or other Apex code prevents this.
dlrs.RollupService.testHandler(new VolunteerActivityAssignment__c());
dlrs.RollupService.testHandler(new %%%NAMESPACE%%%VolunteerActivityAssignment__c());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ private class dlrs_VolunteerActivityTest
private static void testTrigger()
{
// Force the dlrs_VolunteerActivityTrigger to be invoked, fails the test if org config or other Apex code prevents this.
dlrs.RollupService.testHandler(new VolunteerActivity__c());
dlrs.RollupService.testHandler(new %%%NAMESPACE%%%VolunteerActivity__c());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ private class dlrs_VolunteerHoursLogTest
private static void testTrigger()
{
// Force the dlrs_VolunteerHoursLogTrigger to be invoked, fails the test if org config or other Apex code prevents this.
dlrs.RollupService.testHandler(new VolunteerHoursLog__c());
dlrs.RollupService.testHandler(new %%%NAMESPACE%%%VolunteerHoursLog__c());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ private class dlrs_VolunteerPositionAssignmentTest
private static void testTrigger()
{
// Force the dlrs_VolunteerPositionAssignmentTrigger to be invoked, fails the test if org config or other Apex code prevents this.
dlrs.RollupService.testHandler(new VolunteerPositionAssignment__c());
dlrs.RollupService.testHandler(new %%%NAMESPACE%%%VolunteerPositionAssignment__c());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ private class dlrs_VolunteerShiftAssignmentTest
private static void testTrigger()
{
// Force the dlrs_VolunteerShiftAssignmentTrigger to be invoked, fails the test if org config or other Apex code prevents this.
dlrs.RollupService.testHandler(new VolunteerShiftAssignment__c());
dlrs.RollupService.testHandler(new %%%NAMESPACE%%%VolunteerShiftAssignment__c());
}
}
2 changes: 1 addition & 1 deletion unpackaged/config/dlrs/classes/dlrs_VolunteerShiftTest.cls
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ private class dlrs_VolunteerShiftTest
private static void testTrigger()
{
// Force the dlrs_VolunteerShiftTrigger to be invoked, fails the test if org config or other Apex code prevents this.
dlrs.RollupService.testHandler(new VolunteerShift__c());
dlrs.RollupService.testHandler(new %%%NAMESPACE%%%VolunteerShift__c());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</values>
<values>
<field>dlrs__AggregateResultField__c</field>
<value xsi:type="xsd:string">FirstVolunteerDate__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%FirstVolunteerDate__c</value>
</values>
<values>
<field>dlrs__CalculationMode__c</field>
Expand All @@ -28,7 +28,7 @@
</values>
<values>
<field>dlrs__ChildObject__c</field>
<value xsi:type="xsd:string">VolunteerHoursLog__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerHoursLog__c</value>
</values>
<values>
<field>dlrs__ConcatenateDelimiter__c</field>
Expand All @@ -40,11 +40,11 @@
</values>
<values>
<field>dlrs__FieldToAggregate__c</field>
<value xsi:type="xsd:string">StartDate__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%StartDate__c</value>
</values>
<values>
<field>dlrs__FieldToOrderBy__c</field>
<value xsi:type="xsd:string">StartDate__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%StartDate__c</value>
</values>
<values>
<field>dlrs__ParentObject__c</field>
Expand All @@ -60,7 +60,7 @@
</values>
<values>
<field>dlrs__RelationshipField__c</field>
<value xsi:type="xsd:string">VolunteerContact__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerContact__c</value>
</values>
<values>
<field>dlrs__RowLimit__c</field>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</values>
<values>
<field>dlrs__AggregateResultField__c</field>
<value xsi:type="xsd:string">FirstVolunteerDate__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%FirstVolunteerDate__c</value>
</values>
<values>
<field>dlrs__CalculationMode__c</field>
Expand All @@ -28,7 +28,7 @@
</values>
<values>
<field>dlrs__ChildObject__c</field>
<value xsi:type="xsd:string">VolunteerHoursLog__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerHoursLog__c</value>
</values>
<values>
<field>dlrs__ConcatenateDelimiter__c</field>
Expand All @@ -40,11 +40,11 @@
</values>
<values>
<field>dlrs__FieldToAggregate__c</field>
<value xsi:type="xsd:string">StartDate__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%StartDate__c</value>
</values>
<values>
<field>dlrs__FieldToOrderBy__c</field>
<value xsi:type="xsd:string">StartDate__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%StartDate__c</value>
</values>
<values>
<field>dlrs__ParentObject__c</field>
Expand All @@ -60,7 +60,7 @@
</values>
<values>
<field>dlrs__RelationshipField__c</field>
<value xsi:type="xsd:string">VolunteerContact__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerContact__c</value>
</values>
<values>
<field>dlrs__RowLimit__c</field>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</values>
<values>
<field>dlrs__AggregateResultField__c</field>
<value xsi:type="xsd:string">VolunteerHours__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerHours__c</value>
</values>
<values>
<field>dlrs__CalculationMode__c</field>
Expand All @@ -28,7 +28,7 @@
</values>
<values>
<field>dlrs__ChildObject__c</field>
<value xsi:type="xsd:string">VolunteerHoursLog__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerHoursLog__c</value>
</values>
<values>
<field>dlrs__ConcatenateDelimiter__c</field>
Expand All @@ -40,11 +40,11 @@
</values>
<values>
<field>dlrs__FieldToAggregate__c</field>
<value xsi:type="xsd:string">Hours__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%Hours__c</value>
</values>
<values>
<field>dlrs__FieldToOrderBy__c</field>
<value xsi:type="xsd:string">StartDate__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%StartDate__c</value>
</values>
<values>
<field>dlrs__ParentObject__c</field>
Expand All @@ -60,7 +60,7 @@
</values>
<values>
<field>dlrs__RelationshipField__c</field>
<value xsi:type="xsd:string">VolunteerContact__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerContact__c</value>
</values>
<values>
<field>dlrs__RowLimit__c</field>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</values>
<values>
<field>dlrs__AggregateResultField__c</field>
<value xsi:type="xsd:string">FirstShiftDateTime__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%FirstShiftDateTime__c</value>
</values>
<values>
<field>dlrs__CalculationMode__c</field>
Expand All @@ -28,7 +28,7 @@
</values>
<values>
<field>dlrs__ChildObject__c</field>
<value xsi:type="xsd:string">VolunteerShift__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerShift__c</value>
</values>
<values>
<field>dlrs__ConcatenateDelimiter__c</field>
Expand All @@ -40,15 +40,15 @@
</values>
<values>
<field>dlrs__FieldToAggregate__c</field>
<value xsi:type="xsd:string">StartDateTime__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%StartDateTime__c</value>
</values>
<values>
<field>dlrs__FieldToOrderBy__c</field>
<value xsi:type="xsd:string">StartDateTime__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%StartDateTime__c</value>
</values>
<values>
<field>dlrs__ParentObject__c</field>
<value xsi:type="xsd:string">VolunteerActivity__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerActivity__c</value>
</values>
<values>
<field>dlrs__RelationshipCriteriaFields__c</field>
Expand All @@ -60,7 +60,7 @@
</values>
<values>
<field>dlrs__RelationshipField__c</field>
<value xsi:type="xsd:string">VolunteerActivity__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerActivity__c</value>
</values>
<values>
<field>dlrs__RowLimit__c</field>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</values>
<values>
<field>dlrs__AggregateResultField__c</field>
<value xsi:type="xsd:string">VolunteersAssigned__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteersAssigned__c</value>
</values>
<values>
<field>dlrs__CalculationMode__c</field>
Expand All @@ -28,7 +28,7 @@
</values>
<values>
<field>dlrs__ChildObject__c</field>
<value xsi:type="xsd:string">VolunteerActivityAssignment__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerActivityAssignment__c</value>
</values>
<values>
<field>dlrs__ConcatenateDelimiter__c</field>
Expand All @@ -40,15 +40,15 @@
</values>
<values>
<field>dlrs__FieldToAggregate__c</field>
<value xsi:type="xsd:string">VolunteerContact__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerContact__c</value>
</values>
<values>
<field>dlrs__FieldToOrderBy__c</field>
<value xsi:nil="true"/>
</values>
<values>
<field>dlrs__ParentObject__c</field>
<value xsi:type="xsd:string">VolunteerActivity__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerActivity__c</value>
</values>
<values>
<field>dlrs__RelationshipCriteriaFields__c</field>
Expand All @@ -60,7 +60,7 @@
</values>
<values>
<field>dlrs__RelationshipField__c</field>
<value xsi:type="xsd:string">VolunteerActivity__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerActivity__c</value>
</values>
<values>
<field>dlrs__RowLimit__c</field>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</values>
<values>
<field>dlrs__AggregateResultField__c</field>
<value xsi:type="xsd:string">VolunteerHours__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerHours__c</value>
</values>
<values>
<field>dlrs__CalculationMode__c</field>
Expand All @@ -28,7 +28,7 @@
</values>
<values>
<field>dlrs__ChildObject__c</field>
<value xsi:type="xsd:string">VolunteerHoursLog__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerHoursLog__c</value>
</values>
<values>
<field>dlrs__ConcatenateDelimiter__c</field>
Expand All @@ -40,15 +40,15 @@
</values>
<values>
<field>dlrs__FieldToAggregate__c</field>
<value xsi:type="xsd:string">Hours__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%Hours__c</value>
</values>
<values>
<field>dlrs__FieldToOrderBy__c</field>
<value xsi:nil="true"/>
</values>
<values>
<field>dlrs__ParentObject__c</field>
<value xsi:type="xsd:string">VolunteerActivity__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerActivity__c</value>
</values>
<values>
<field>dlrs__RelationshipCriteriaFields__c</field>
Expand All @@ -60,7 +60,7 @@
</values>
<values>
<field>dlrs__RelationshipField__c</field>
<value xsi:type="xsd:string">VolunteerActivity__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerActivity__c</value>
</values>
<values>
<field>dlrs__RowLimit__c</field>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</values>
<values>
<field>dlrs__AggregateResultField__c</field>
<value xsi:type="xsd:string">VolunteerActivities__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerActivities__c</value>
</values>
<values>
<field>dlrs__CalculationMode__c</field>
Expand All @@ -28,7 +28,7 @@
</values>
<values>
<field>dlrs__ChildObject__c</field>
<value xsi:type="xsd:string">VolunteerActivity__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerActivity__c</value>
</values>
<values>
<field>dlrs__ConcatenateDelimiter__c</field>
Expand All @@ -48,7 +48,7 @@
</values>
<values>
<field>dlrs__ParentObject__c</field>
<value xsi:type="xsd:string">VolunteerPosition__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerPosition__c</value>
</values>
<values>
<field>dlrs__RelationshipCriteriaFields__c</field>
Expand All @@ -60,7 +60,7 @@
</values>
<values>
<field>dlrs__RelationshipField__c</field>
<value xsi:type="xsd:string">VolunteerPosition__c</value>
<value xsi:type="xsd:string">%%%NAMESPACE%%%VolunteerPosition__c</value>
</values>
<values>
<field>dlrs__RowLimit__c</field>
Expand Down
Loading

0 comments on commit df2c3f7

Please sign in to comment.