Merging EFX back to Main (PROD)

.github/workflows/create-git-and-image-tag.yml

@@ -58,4 +58,5 @@ jobs:
           oc login --token=${{ env.OPENSHIFT_TOKEN }} --server=${{ env.OPENSHIFT_SERVER }}
           oc project ${{ env.OPENSHIFT_NAMESPACE }}
 
-          oc tag ${{ env.OPENSHIFT_NAMESPACE }}/${{ env.REPO_NAME }}-${{ env.APP_NAME_BACKEND }}:latest ${{ env.OPENSHIFT_NAMESPACE }}/${{ env.REPO_NAME }}-${{ env.APP_NAME_BACKEND }}:${{ github.event.inputs.version }}
+          oc tag ${{ env.OPENSHIFT_NAMESPACE }}/${{ env.REPO_NAME }}-${{ env.APP_NAME_BACKEND }}-${{ env.BRANCH }}:latest \
+            ${{ env.OPENSHIFT_NAMESPACE }}/${{ env.REPO_NAME }}-${{ env.APP_NAME_BACKEND }}-${{ env.BRANCH }}:${{ github.event.inputs.version }}

.github/workflows/deploy-to-openshift-dev.yml

@@ -152,7 +152,8 @@ jobs:
           # Create the image stream if it doesn't exist
           oc create imagestream ${{ env.IMAGE_NAME }}  2> /dev/null || true && echo "D365 API image stream in place"
 
-          oc tag ${{ steps.push-image-backend.outputs.registry-path }} ${{ env.IMAGE_NAME }}:${{ env.TAG }}
+          oc tag ${{ steps.push-image-backend.outputs.registry-path }} \
+            ${{ env.IMAGE_NAME }}-${{ env.BRANCH }}:${{ env.TAG }}
 
           # Process and apply deployment template
           oc process \
@@ -212,6 +213,6 @@ jobs:
           oc rollout status deployment/${{ env.APP_NAME }}-${{ env.APP_NAME_BACKEND }}-${{ env.APP_ENVIRONMENT }}
 
       - name: ZAP Scan
-        uses: zaproxy/action-full-scan@v0.8.0
+        uses: zaproxy/action-full-scan@v0.12.0
         with:
           target: 'https://${{ env.HOST_ROUTE }}'

.github/workflows/deploy-to-openshift-efx.yml

@@ -124,7 +124,7 @@ jobs:
           oc create imagestream ${{ env.IMAGE_NAME }}  2> /dev/null || true && echo "D365 API image stream in place"
 
           # Create tag for EFX env from DEV env image
-          oc tag ${{ env.NAMESPACE }}-dev/${{ env.IMAGE_NAME }}:${{ inputs.tag }} ${{ env.NAMESPACE }}-test/${{ env.IMAGE_NAME }}:${{ inputs.tag }}
+          oc tag ${{ env.NAMESPACE }}-dev/${{ env.IMAGE_NAME }}-${{ env.BRANCH }}:${{ inputs.tag }} ${{ env.NAMESPACE }}-test/${{ env.IMAGE_NAME }}-${{ env.BRANCH }}:${{ inputs.tag }}
 
           # Process and apply deployment template
           oc process \

.github/workflows/deploy-to-openshift-prod.yml

@@ -124,7 +124,7 @@ jobs:
           oc create imagestream ${{ env.IMAGE_NAME }}  2> /dev/null || true && echo "D365 API image stream in place"
 
           # Create tag for PROD env from DEV env image
-          oc tag ${{ env.NAMESPACE }}-dev/${{ env.IMAGE_NAME }}:${{ inputs.tag }} ${{ env.NAMESPACE }}-prod/${{ env.IMAGE_NAME }}:${{ inputs.tag }}
+          oc tag ${{ env.NAMESPACE }}-dev/${{ env.IMAGE_NAME }}-${{ env.BRANCH }}:${{ inputs.tag }} ${{ env.NAMESPACE }}-prod/${{ env.IMAGE_NAME }}-${{ env.BRANCH }}:${{ inputs.tag }}
 
           # Process and apply deployment template
           oc process \

.github/workflows/deploy-to-openshift-uat.yml

@@ -124,7 +124,7 @@ jobs:
           oc create imagestream ${{ env.IMAGE_NAME }}  2> /dev/null || true && echo "D365 API image stream in place"
 
           # Create tag for UAT env from DEV env image
-          oc tag ${{ env.NAMESPACE }}-dev/${{ env.IMAGE_NAME }}:${{ inputs.tag }} ${{ env.NAMESPACE }}-test/${{ env.IMAGE_NAME }}:${{ inputs.tag }}
+          oc tag ${{ env.NAMESPACE }}-dev/${{ env.IMAGE_NAME }}-${{ env.BRANCH }}:${{ inputs.tag }} ${{ env.NAMESPACE }}-test/${{ env.IMAGE_NAME }}-${{ env.BRANCH }}:${{ inputs.tag }}
 
           # Process and apply deployment template
           oc process \

ECC.Core.DataContext/DataverseContext.cs

@@ -611,6 +611,17 @@ public System.Linq.IQueryable<ECC.Core.DataContext.ofm_system_message> ofm_syste
 			}
 		}
 
+		/// <summary>
+		/// Gets a binding to the set of all <see cref="ECC.Core.DataContext.ofm_top_up_fund"/> entities.
+		/// </summary>
+		public System.Linq.IQueryable<ECC.Core.DataContext.ofm_top_up_fund> ofm_top_up_fundSet
+		{
+			get
+			{
+				return this.CreateQuery<ECC.Core.DataContext.ofm_top_up_fund>();
+			}
+		}
+
 		/// <summary>
 		/// Gets a binding to the set of all <see cref="ECC.Core.DataContext.Team"/> entities.
 		/// </summary>