Merge branch 'develop' into feature-35491

Author: zikani03

.github/workflows/main.yml

@@ -6,6 +6,10 @@ on:
       - '*'
 #    tags:
 #      - '!v*'
+  pull_request:
+    branches:
+      - '*'
+    types: [opened, synchronize, reopened]
 
 jobs:
   build:

.gitignore

@@ -26,6 +26,9 @@ proguard/
 # Log Files
 *.log
 
+# Java heap dump files
+*.hprof
+
 # Android Studio Navigation editor temp files
 .navigation/
 
@@ -76,10 +79,16 @@ fastlane/readme.md
 
 # Visual Studio Code
 .vscode/
+./.DS_Store
+./.git/.DS_Store
+*.DS_Store
 
 
 # Custom product flavours
 *custom-flavours.gradle
 .DS_Store
 
+.DS_Store
+*.properties
+./gradle
 *.DS_Store

README.md

@@ -39,7 +39,10 @@ private String _Domain = "http://132.148.151.32/";
 ```
 
 For demo purposes, the default Web Services domain is set to the openIMIS
-demo server: demo.openimis.org (IP: 132.148.151.32).  
+demo server: demo.openimis.org (IP: 132.148.151.32).
+
+If you want to receive error and exception events in sentry
+you can set `sentry_dsn` in build.gradle file
 
 ### Running the app
 

claimManagement/build.gradle

@@ -62,6 +62,7 @@ android {
         buildConfigField "String", "RAR_PASSWORD", '")(#$1HsD"'
         buildConfigField "String", "API_VERSION", '"3"'
         resValue "string", "release_tag", "release/25.04"
+        resValue "string", "sentry_dsn", ""
     }
 
     productFlavors {
@@ -181,6 +182,13 @@ android {
         exclude 'META-INF/DEPENDENCIES'
     }
     namespace 'org.openimis.imisclaims'
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+            returnDefaultValues = true
+        }
+    }
 }
 
 apollo {
@@ -194,6 +202,13 @@ apollo {
     ]
 }
 
+tasks.withType(Test).configureEach {
+    testLogging {
+        events "passed", "skipped", "failed"
+        exceptionFormat "full"
+        showStandardStreams = false
+    }
+}
 
 // Apply custom flavours
 if(file('custom-flavours.gradle').exists()){
@@ -216,10 +231,15 @@ dependencies {
     implementation ('com.apollographql.apollo:apollo-android-support:2.5.14'){
         because("Apollo 3+ only works with Kotlin coroutines")
     }
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:5.5.0'
+    testImplementation 'org.robolectric:robolectric:4.11.1'
+    testImplementation 'androidx.test:core:1.5.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test:core:1.5.0'
     implementation group: 'com.squareup.picasso', name: 'picasso', version: '2.71828'
     implementation group: 'net.lingala.zip4j', name: 'zip4j', version: '1.2.7'
+    implementation 'io.sentry:sentry-android:8.25.0'
 
 }

claimManagement/fakedatabase

@@ -56,6 +56,10 @@
                 android:resource="@xml/paths" />
         </provider>
 
+        <meta-data
+            android:name="io.sentry.dsn"
+            android:value="@string/sentry_dsn" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"

claimManagement/fakemapping

@@ -1,5 +1,5 @@
-query GetMedications($offset: Int) {
-  medicalItems(offset: $offset) {
+query GetMedications($offset: Int, $pricelistUuid: UUID, $date: Date) {
+  medicalItemsStr(offset: $offset, pricelistUuid: $pricelistUuid, date: $date) {
   pageInfo{
     hasNextPage
   }

claimManagement/src/main/AndroidManifest.xml

@@ -6,47 +6,25 @@ query GetPaymentList($claim_administrator_code: String) {
                 healthFacility {
                     code
                     servicesPricelist {
+                        uuid
                         details {
                             edges {
                                 node {
                                     service {
-                                        id
                                         code
                                         name
                                         price
-                                        packagetype
-                                        type
-                                        careType
-                                        manualPrice
-                                        serviceserviceSet {
-                                            service {
-                                                id
-                                                code
-                                                name
-                                            }
-                                            qtyProvided
-                                            priceAsked
-                                        }
-                                        servicesLinked {
-                                            item {
-                                                id
-                                                code
-                                                name
-                                            }
-                                            qtyProvided
-                                            priceAsked
-                                        }
                                     }
                                 }
                             }
                         }
                     }
                     itemsPricelist {
+                        uuid
                         details {
                             edges {
                                 node {
                                     item {
-                                        id
                                         code
                                         name
                                         price

claimManagement/src/main/graphql/org.openimis.imisclaim/GetMedications.graphql

@@ -0,0 +1,37 @@
+query GetServices ($offset: Int, $pricelistUuid: UUID, $date: Date) {
+    medicalServicesStr(offset: $offset, pricelistUuid: $pricelistUuid, date: $date) {
+        pageInfo {
+            hasNextPage
+        }
+        edges {
+            node {
+                id
+                code
+                name
+                packagetype
+                type
+                price
+                careType
+                manualPrice
+                serviceserviceSet {
+                    service {
+                        id
+                        code
+                        name
+                    }
+                    qtyProvided
+                    priceAsked
+                }
+                servicesLinked {
+                    item {
+                        id
+                        code
+                        name
+                    }
+                    qtyProvided
+                    priceAsked
+                }
+            }
+        }
+    }
+}