Merge remote-tracking branch 'origin/master' into master-release

opensrp · Jun 4, 2024 · 35794b5 · 35794b5
2 parents ee02125 + 201a874
commit 35794b5
Show file tree

Hide file tree

Showing 77 changed files with 4,352 additions and 191 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,7 @@
 Fixes #[issue number]
 
 **Description**
-Clear and concise code change description. 
+Clear and concise code change description.
 
 **Alternative(s) considered**
 Have you considered any alternatives? And if so, why have you chosen the approach in this PR?
@@ -14,8 +14,9 @@ Choose one: (Bug fix | Feature | Documentation | Testing | Code health | Builds
 **Screenshots (if applicable)**
 
 **Checklist**
+
 - [ ] I have read and acknowledged the [Code of conduct](https://github.com/google/android-fhir/blob/master/CODE_OF_CONDUCT.md).
-- [ ] I have read the [Contributing](https://github.com/google/android-fhir/wiki/Contributing) page.
+- [ ] I have read the [Contributing](https://google.github.io/android-fhir/contrib/) page.
 - [ ] I have signed the Google [Individual CLA](https://cla.developers.google.com/about/google-individual), or I am covered by my company's [Corporate CLA](https://cla.developers.google.com/about/google-corporate ).
 - [ ] I have discussed my proposed solution with code owners in the linked issue(s) and we have agreed upon the general approach.
 - [ ] I have run `./gradlew spotlessApply` and `./gradlew spotlessCheck` to check my code follows the style guide of this project.

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -118,7 +118,7 @@ jobs:
 
       - name: Setup GitHub Pages
         if: ${{ github.event_name == 'push' }}
-        uses: actions/configure-pages@v4
+        uses: actions/configure-pages@v5
 
       - name: Upload site/ directory as GitHub Pages artifact
         if: ${{ github.event_name == 'push' }}

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,12 @@
 {
+  "editor.autoIndent": "advanced",
+  "editor.insertSpaces": true,
+  "editor.indentSize": "tabSize",
+  "editor.tabSize": 2,
+
+  "files.insertFinalNewline": true,
+  "files.trimTrailingWhitespace": true,
+
   // https://squidfunk.github.io/mkdocs-material/creating-your-site/
   "yaml.schemas": {
     "https://squidfunk.github.io/mkdocs-material/schema.json": "mkdocs.yaml"
@@ -10,5 +18,15 @@
     "tag:yaml.org,2002:python/name:material.extensions.emoji.to_svg",
     "tag:yaml.org,2002:python/name:material.extensions.emoji.twemoji",
     "tag:yaml.org,2002:python/name:pymdownx.superfences.fence_code_format"
-  ]
+  ],
+
+  "[yaml]": {
+    "editor.defaultFormatter": "redhat.vscode-yaml",
+    "diffEditor.ignoreTrimWhitespace": false,
+    "editor.quickSuggestions": {
+      "other": true,
+      "comments": false,
+      "strings": true
+    }
+  }
 }
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,2 +1,14 @@
-# Owners of the repository
-* @google/android-fhir @santosh-pingle
+# This file lists people who get automatically added as Reviewers for Pull Requests.
+#
+# Note that we intentionally do NOT just include all committers here by using @google/android-fhir,
+# nor were we able to get it working using a group such as @google/android-fhir-reviewers;
+# details about why are described on https://github.com/google/android-fhir/issues/2320
+# and https://github.com/google/android-fhir/pull/2536.
+#
+# See https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
+
+# These people for *ALL* Pull Requests:
+* @aditya-07 @jingtang10 @MJ1998 @santosh-pingle 
+
+# These for anything documentation related:
+docs/* @vorburger
diff --git a/Contributing.md b/Contributing.md
@@ -22,7 +22,7 @@ use GitHub pull requests for this purpose. Consult
 [GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
 information on using pull requests.
 
-See [Developer's Guide](https://github.com/google/android-fhir/wiki/Developer's-Guide) for more information.
+See [Contributor's Guide](https://google.github.io/android-fhir/contrib/) for more information.
 
 ## Community Guidelines
 

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/README.md b/README.md
@@ -11,41 +11,43 @@ mobile applications.
 
 The SDK contains the following libraries:
 
-| Library              | Latest release                                                                                                                                                                                                                    | Code                                                                  | Wiki                                                                                | Min SDK                    | Summary                                                                                                                                                    |
+| Library              | Latest release                                                                                                                                                                                                                    | Code                                                                  | Docs                                                                                | Min SDK                    | Summary                                                                                                                                                    |
 | -------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------- | ----------------------------------------------------------------------------------- |----------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Data Capture Library | [![Google Maven](https://badgen.net/maven/v/metadata-url/dl.google.com/dl/android/maven2/com/google/android/fhir/data-capture/maven-metadata.xml)](https://maven.google.com/web/index.html?#com.google.android.fhir:data-capture) | [code](https://github.com/google/android-fhir/tree/master/datacapture)| [wiki](https://github.com/google/android-fhir/wiki/Structured-Data-Capture-Library) | Android 7.0 (API level 24) | Collect, validate, and process healthcare data on Android                                                                                                  |
-| FHIR Engine Library  | [![Google Maven](https://badgen.net/maven/v/metadata-url/dl.google.com/dl/android/maven2/com/google/android/fhir/engine/maven-metadata.xml)](https://maven.google.com/web/index.html?#com.google.android.fhir:engine)             | [code](https://github.com/google/android-fhir/tree/master/engine)     | [wiki](https://github.com/google/android-fhir/wiki/FHIR-Engine-Library)             | Android 7.0 (API level 24) | Store and manage FHIR resources locally on Android and synchronize with FHIR server                                                                        |
-| Workflow Library     | [![Google Maven](https://badgen.net/maven/v/metadata-url/dl.google.com/dl/android/maven2/com/google/android/fhir/workflow/maven-metadata.xml)](https://maven.google.com/web/index.html?#com.google.android.fhir:workflow)         | [code](https://github.com/google/android-fhir/tree/master/workflow)   | [wiki](https://github.com/google/android-fhir/wiki/Workflow-Library)                | Android 7.0 (API level 24) | Provide decision support and analytics in clinical workflow on Android including implementation of specific FHIR operations ($measure_evaluate and $apply) |
+| Data Capture Library | [![Google Maven](https://badgen.net/maven/v/metadata-url/dl.google.com/dl/android/maven2/com/google/android/fhir/data-capture/maven-metadata.xml)](https://maven.google.com/web/index.html?#com.google.android.fhir:data-capture) | [code](https://github.com/google/android-fhir/tree/master/datacapture)| [docs](https://google.github.io/android-fhir/use/SDCL/) | Android 7.0 (API level 24) | Collect, validate, and process healthcare data on Android                                                                                                  |
+| FHIR Engine Library  | [![Google Maven](https://badgen.net/maven/v/metadata-url/dl.google.com/dl/android/maven2/com/google/android/fhir/engine/maven-metadata.xml)](https://maven.google.com/web/index.html?#com.google.android.fhir:engine)             | [code](https://github.com/google/android-fhir/tree/master/engine)     | [docs](https://google.github.io/android-fhir/use/FEL/)             | Android 7.0 (API level 24) | Store and manage FHIR resources locally on Android and synchronize with FHIR server                                                                        |
+| Workflow Library     | [![Google Maven](https://badgen.net/maven/v/metadata-url/dl.google.com/dl/android/maven2/com/google/android/fhir/workflow/maven-metadata.xml)](https://maven.google.com/web/index.html?#com.google.android.fhir:workflow)         | [code](https://github.com/google/android-fhir/tree/master/workflow)   | [docs](https://google.github.io/android-fhir/use/WFL/)                | Android 7.0 (API level 24) | Provide decision support and analytics in clinical workflow on Android including implementation of specific FHIR operations ($measure_evaluate and $apply) |
 
 ## Demo apps
 
 This repository also contains the following demo apps:
 
-| Demo app                            | Code                                                               | Wiki                                                                                            |
-| ----------------------------------- | ------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------- |
-| FHIR Engine Demo App                | [code](https://github.com/google/android-fhir/tree/master/demo)    | [wiki](https://github.com/google/android-fhir/wiki/FHIR-Engine-Library#demo-app)                |
-| Structured Data Capture Catalog App | [code](https://github.com/google/android-fhir/tree/master/catalog) | [wiki](https://github.com/google/android-fhir/wiki/Structured-Data-Capture-Library#catalog-app) |
+| Demo app                            | Code                                                               | Docs                                                              |
+| ----------------------------------- | ------------------------------------------------------------------ | ----------------------------------------------------------------- |
+| FHIR Engine Demo App                | [code](https://github.com/google/android-fhir/tree/master/demo)    | [docs](https://google.github.io/android-fhir/use/FEL/Demo-app/)   |
+| Structured Data Capture Catalog App | [code](https://github.com/google/android-fhir/tree/master/catalog) | [docs](https://google.github.io/android-fhir/use/SDCL/Demo-app/)  |
 
 **These applications are provided for demo purposes only. Do NOT use in production.**
 
 ## Contributing
 
 The development of the SDK began as a collaborative effort between Google, [The World Health Organization](https://www.who.int/), and [Ona](https://ona.io/). Since then, a consortium of application developers have been contributing to the project.
 
-To contribute to the project, please see [Contributing](https://github.com/google/android-fhir/wiki/Contributing) to get started.
+To contribute to the project, please see [Contributing](https://google.github.io/android-fhir/contrib/) to get started.
 
 ## Feedback and getting help
 
 You can create a [GitHub issue](https://github.com/google/android-fhir/issues) for bugs and feature requests.
 
 In case you find any security bug, please do NOT create a GitHub issue. Instead, email us at <android-fhir-sdk-feedback@google.com>.
 
-If you want to provide any feedback or discuss use cases you can: 
+If you want to provide any feedback or discuss use cases you can:
+
 * email us at <android-fhir-sdk-feedback@google.com>
 * start a [GitHub discussion](https://github.com/google/android-fhir/discussions)
 * start a new topic in [android](https://chat.fhir.org/#narrow/stream/276344-android), [questionnaire](https://chat.fhir.org/#narrow/stream/179255-questionnaire), [implementers](https://chat.fhir.org/#narrow/stream/179166-implementers), or [WHO SMART guidelines](https://chat.fhir.org/#narrow/stream/310477-who-smart-guidelines) stream in the [FHIR Zulip chat](https://chat.fhir.org/)
 
 ## Disclaimer
+
 This product is not intended to be a medical device.
 
 HL7®, and FHIR® are the registered trademarks of Health Level Seven International and their use of

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -48,7 +48,6 @@ object Dependencies {
     const val structuresDstu2Module = "ca.uhn.hapi.fhir:hapi-fhir-structures-dstu2"
     const val structuresDstu3Module = "ca.uhn.hapi.fhir:hapi-fhir-structures-dstu3"
     const val structuresR4Module = "ca.uhn.hapi.fhir:hapi-fhir-structures-r4"
-    const val structuresR4bModule = "ca.uhn.hapi.fhir:hapi-fhir-structures-r4b"
     const val structuresR5Module = "ca.uhn.hapi.fhir:hapi-fhir-structures-r5"
 
     const val validationModule = "ca.uhn.hapi.fhir:hapi-fhir-validation"
@@ -67,26 +66,11 @@ object Dependencies {
 
     const val guavaCachingModule = "ca.uhn.hapi.fhir:hapi-fhir-caching-guava"
 
-    const val fhirBase = "$fhirBaseModule:${Versions.hapiFhir}"
-    const val fhirClient = "$fhirClientModule:${Versions.hapiFhir}"
-    const val structuresDstu2 = "$structuresDstu2Module:${Versions.hapiFhir}"
-    const val structuresDstu3 = "$structuresDstu3Module:${Versions.hapiFhir}"
     const val structuresR4 = "$structuresR4Module:${Versions.hapiFhir}"
-    const val structuresR4b = "$structuresR4bModule:${Versions.hapiFhir}"
-    const val structuresR5 = "$structuresR5Module:${Versions.hapiFhir}"
 
     const val validation = "$validationModule:${Versions.hapiFhir}"
-    const val validationDstu3 = "$validationDstu3Module:${Versions.hapiFhir}"
     const val validationR4 = "$validationR4Module:${Versions.hapiFhir}"
-    const val validationR5 = "$validationR5Module:${Versions.hapiFhir}"
-
-    const val fhirCoreDstu2 = "$fhirCoreDstu2Module:${Versions.hapiFhirCore}"
-    const val fhirCoreDstu2016 = "$fhirCoreDstu2016Module:${Versions.hapiFhirCore}"
-    const val fhirCoreDstu3 = "$fhirCoreDstu3Module:${Versions.hapiFhirCore}"
-    const val fhirCoreR4 = "$fhirCoreR4Module:${Versions.hapiFhirCore}"
-    const val fhirCoreR4b = "$fhirCoreR4bModule:${Versions.hapiFhirCore}"
-    const val fhirCoreR5 = "$fhirCoreR5Module:${Versions.hapiFhirCore}"
-    const val fhirCoreUtils = "$fhirCoreUtilsModule:${Versions.hapiFhirCore}"
+
     const val fhirCoreConvertors = "$fhirCoreConvertorsModule:${Versions.hapiFhirCore}"
 
     const val guavaCaching = "$guavaCachingModule:${Versions.hapiFhir}"
@@ -329,7 +313,7 @@ object Dependencies {
   }
 
   fun hapiFhirConstraints(): Map<String, DependencyConstraint.() -> Unit> {
-    return mutableMapOf<String, DependencyConstraint.() -> Unit>(
+    return mutableMapOf(
       guavaModule to { version { strictly(Versions.guava) } },
       HapiFhir.fhirBaseModule to { version { strictly(Versions.hapiFhir) } },
       HapiFhir.fhirClientModule to { version { strictly(Versions.hapiFhir) } },

diff --git a/demo/src/main/java/com/google/android/fhir/demo/PatientDetailsViewModel.kt b/demo/src/main/java/com/google/android/fhir/demo/PatientDetailsViewModel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import com.google.android.fhir.FhirEngine
-import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.revInclude
 import com.google.android.fhir.search.search
 import java.text.SimpleDateFormat
@@ -379,3 +378,12 @@ data class RiskAssessmentItem(
   var lastContacted: String,
   var patientCardColor: Int,
 )
+
+/**
+ * The logical (unqualified) part of the ID. For example, if the ID is
+ * "http://example.com/fhir/Patient/123/_history/456", then this value would be "123".
+ */
+private val Resource.logicalId: String
+  get() {
+    return this.idElement?.idPart.orEmpty()
+  }
diff --git a/docs/contrib/dependencies.md b/docs/contrib/dependencies.md
@@ -0,0 +1,5 @@
+# External Dependencies
+
+This Android FHIR SDK uses a number of external libraries.
+
+Their exact version numbers are shown on [the Dependency Graph Insights](https://github.com/google/android-fhir/network/dependencies), which is automatically updated.