Merge branch 'refs/heads/main' into CNDIT-1777-update-observation-for…

…-nested-jsons

# Conflicts:
#	liquibase-service/src/main/resources/db/changelog/db.rdb.changelog-16.1.yaml

.github/pull_request_template.md

@@ -0,0 +1,30 @@
+## Notes
+
+Please include a summary of the change and which issue is fixed or which feature is added. 
+
+## JIRA
+
+- **Related story**: [Jira Ticket](url)
+
+## Checklist
+
+- [ ] PR focuses on a single story.
+- [ ] New unit tests added and ensured they pass.
+- [ ] Service has been tested in local and it works as expected.
+- [ ] Documentation has been updated for this code change (if needed).
+- [ ] Code follows the Java Coding Conventions (https://www.oracle.com/java/technologies/javase/codeconventions-programmingpractices.html).
+
+## Types of changes
+
+What types of changes does this PR introduces?
+
+- [ ] Bugfix
+- [ ] New feature
+- [ ] Breaking change
+
+## Testing
+
+- [ ] Does this PR has >90% code coverage?
+- [ ] Is the screenshot attached for code coverage?
+- [ ] Does the `gradle build` pass in your local? 
+- [ ] Is the `gradle build` logs attached?

liquibase-service/src/main/resources/db/changelog/db.rdb.changelog-16.1.yaml

@@ -270,46 +270,67 @@ databaseChangeLog:
       author: liquibase
       changes:
         - sqlFile:
-            path: 017-create_nrt_observation_coded-001.sql
+            path: 007-sp_s_pagebuilder_postprocessing-002.sql
             splitStatements: false
   - changeSet:
       id: 39
       author: liquibase
       changes:
         - sqlFile:
-            path: 017-create_nrt_observation_date-001.sql
+            path: 010-sp_sld_investigation_repeat_postprocessing-002.sql
             splitStatements: false
   - changeSet:
       id: 40
       author: liquibase
       changes:
         - sqlFile:
-            path: 017-create_nrt_observation_edx-001.sql
+            path: 013-sp_hepatitis_datamart_postprocessing-002.sql
             splitStatements: false
   - changeSet:
       id: 41
       author: liquibase
       changes:
         - sqlFile:
-            path: 017-create_nrt_observation_material-001.sql
+            path: 017-create_nrt_observation_coded-001.sql
             splitStatements: false
   - changeSet:
       id: 42
       author: liquibase
       changes:
         - sqlFile:
-            path: 017-create_nrt_observation_numeric-001.sql
+            path: 017-create_nrt_observation_date-001.sql
             splitStatements: false
   - changeSet:
       id: 43
       author: liquibase
       changes:
         - sqlFile:
-            path: 017-create_nrt_observation_reason-001.sql
+            path: 017-create_nrt_observation_edx-001.sql
             splitStatements: false
   - changeSet:
       id: 44
       author: liquibase
+      changes:
+        - sqlFile:
+            path: 017-create_nrt_observation_material-001.sql
+            splitStatements: false
+  - changeSet:
+      id: 45
+      author: liquibase
+      changes:
+        - sqlFile:
+            path: 017-create_nrt_observation_numeric-001.sql
+            splitStatements: false
+  - changeSet:
+      id: 46
+      author: liquibase
+      changes:
+        - sqlFile:
+            path: 017-create_nrt_observation_reason-001.sql
+            splitStatements: false
+  - changeSet:
+      id: 47
+      author: liquibase
       changes:
         - sqlFile:
             path: 017-create_nrt_observation_txt-001.sql