Merge branch 'main' of https://github.com/bcgov/MoH-SAT into EDRD-Spr…

…int-4
bcgov · Jan 21, 2024 · 9c7fce0 · 9c7fce0
2 parents 1094e0c + ea60872
commit 9c7fce0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/.github/workflows/create-build.yml b/.github/workflows/create-build.yml
@@ -34,7 +34,7 @@ jobs:
 
 
     - name: Package Upgrade
-      run: sfdx package version create --target-dev-hub=devhub --definition-file=config/project-scratch-def.json --installation-key-bypass --package="Special Authority App" --wait=15 --dev-debug 
+      run: sfdx package version create --target-dev-hub=devhub --definition-file=config/project-scratch-def.json --installation-key-bypass --package="Special Authority App" --wait=15 --dev-debug --code-coverage
       # sfdx package version create  --target-dev-hub=devhub --definition-file=config/project-scratch-def.json --installation-key-bypass --package="Special Authority App" --wait=15 --code-coverage
       # sf package version create  --target-dev-hub=devhub --definition-file=config/project-scratch-def.json --installation-key-bypass --package="Special Authority App" --wait=15 -c
       # sfdx force:package:version:create -v devhub -d force-app -f config/project-scratch-def.json -x -p "Special Authority App" -w 15 -c

diff --git a/.github/workflows/deploy-to-build.yml b/.github/workflows/deploy-to-build.yml
@@ -14,31 +14,34 @@ jobs:
 
     - name: 'Install Salesforce CLI'
       run: |
-          wget https://developer.salesforce.com/media/salesforce-cli/sfdx/channels/stable/sfdx-linux-x64.tar.xz
+          wget https://developer.salesforce.com/media/salesforce-cli/sf/channels/stable/sf-linux-x64.tar.xz
           mkdir ~/sfdx
-          tar xJf sfdx-linux-x64.tar.xz -C ~/sfdx --strip-components 1
+          tar xJf sf-linux-x64.tar.xz -C ~/sfdx --strip-components 1
           echo "$HOME/sfdx/bin" >> $GITHUB_PATH
-          ~/sfdx/bin/sfdx version
+          ~/sfdx/bin/sf version
       
     - name: Authenticate with Sandbox
       run: |
         echo ${{ secrets.SALESFORCE_BUILD_AUTH }} > sfdxurl.txt
-        sfdx auth:sfdxurl:store --sfdxurlfile sfdxurl.txt --setalias SAT-BUILD
+        sf auth:sfdxurl:store --sfdx-url-file sfdxurl.txt --alias SAT-BUILD
 
     - name: Remove auth file
       run: rm -f ./sfdxurl.txt
 
     - name: Deploy Source in dev-app-pre
-      run: sfdx force:source:deploy -p dev-app-pre -u SAT-BUILD -w 15 -l RunLocalTests
+      run: sf project deploy start -d dev-app-pre -o SAT-BUILD -w 15 -l RunLocalTests
 
     - name: Install version ID
-      run: sfdx force:package:install --package "${{ github.event.inputs.package }}" -u SAT-BUILD -b 15 -w 15 --noprompt --wait 10
+      run: sf package install --package "${{ github.event.inputs.package }}" -o SAT-BUILD -b 15 --noprompt --wait 10
 
-    - name: Re-deploy metadata
-      run: sfdx force:source:deploy -p force-app/main/default/objects,force-app/main/default/queues -u SAT-BUILD -w 15 -l RunLocalTests
+    - name: Re-deploy default objects
+      run: sf project deploy start -d force-app/main/default/objects -o SAT-BUILD -w 15 -l RunLocalTests
+
+    - name: Re-deploy default queues 
+      run: sf project deploy start -d force-app/main/default/queues -o SAT-BUILD -w 15 -l RunLocalTests
 
     - name: Deploy Source in dev-app-post
-      run: sfdx force:source:deploy -p dev-app-post -u SAT-BUILD -w 15 -l RunLocalTests
+      run: sf project deploy start -d dev-app-post -o SAT-BUILD -w 15 -l RunLocalTests
 
 #    - name: Deploy destructive changes
 #      run: sfdx force:mdapi:deploy -d destructiveChanges -u SAT-BUILD -o -g -l RunLocalTests -w 15
diff --git a/force-app/main/default/classes/ODRIntegration.cls b/force-app/main/default/classes/ODRIntegration.cls
@@ -439,7 +439,7 @@ public static PrescriptionHistoryResponse fetchPrescriptionHistoryWithSearchKey(
         jsonMap.put('phn', getPatientIdentifier(recordId));
         jsonMap.put('pageSize', count);
         jsonMap.put('pageNo',page);
-        jsonMap.put('sort','ASC');        
+        jsonMap.put('sort','DESC');        
 
         CalloutResponse calloutResponseObject = sendRequestAndReturnBody(recordId,
                                                                          'callout:ODR_Credentials/odr/sat/pnetsa/medHistory',

diff --git a/sfdx-project.json b/sfdx-project.json
@@ -8,8 +8,8 @@
       "path": "force-app",
       "default": true,
       "package": "Special Authority App",
-      "versionName": "Version 12.0.3",
-      "versionNumber": "12.0.3.NEXT"
+      "versionName": "Version 12.0.5",
+      "versionNumber": "12.0.5.NEXT"
     },
     {
       "path": "dev-app-post",
@@ -493,6 +493,10 @@
     "Special Authority [email protected]": "04tOG0000000BebYAE",
     "Special Authority [email protected]": "04tOG0000000E7pYAE",
     "Special Authority [email protected]": "04tOG0000000F8jYAE",
-    "Special Authority [email protected]": "04tOG0000000FALYA2"
+    "Special Authority [email protected]": "04tOG0000000FALYA2",
+    "Special Authority [email protected]": "04tOG0000000FiDYAU",
+    "Special Authority [email protected]": "04tOG0000000FyLYAU",
+    "Special Authority [email protected]": "04tOG0000000G81YAE",
+    "Special Authority [email protected]": "04tOG0000000G9dYAE"
   }
 }