Next prod

Makefile

@@ -14,7 +14,7 @@ start: ## Start the development server
 
 .PHONY: api-test
 api-test: ## Test the backend
-	@docker compose run --rm api poetry run pytest --no-cov-on-fail --cov --create-db -vv
+	@docker compose run --rm api poetry run pytest --no-cov-on-fail --cov -vv
 
 .PHONY: api-lint
 api-lint: ## Lint the backend

README.md

@@ -19,6 +19,7 @@ After installing and configuring those, download [docker-compose.yml](https://ra
 
 ```bash
 echo "UID=$(id -u)" > .env
+touch ./caluma/.env
 docker-compose up -d
 ```
 
@@ -84,15 +85,15 @@ docker compose up -d
 # Wait for the database migrations to complete for the API and Caluma.
 make caluma-loadconfig
 # upload the templates to DMS
-docker compose run --rm api python manage.py upload_template -t mysagw/identity/templates/identity-labels.docx
-docker compose run --rm api python manage.py upload_template -t mysagw/accounting/templates/accounting-cover.docx
-docker compose run --rm api python manage.py upload_template -t mysagw/case/templates/acknowledgement-de.docx
-docker compose run --rm api python manage.py upload_template -t mysagw/case/templates/acknowledgement-fr.docx
-docker compose run --rm api python manage.py upload_template -t mysagw/case/templates/acknowledgement-en.docx
-docker compose run --rm api python manage.py upload_template -t mysagw/case/templates/credit-approval-de.docx
-docker compose run --rm api python manage.py upload_template -t mysagw/case/templates/credit-approval-fr.docx
-docker compose run --rm api python manage.py upload_template -t mysagw/case/templates/credit-approval-en.docx
-docker compose run --rm api python manage.py upload_template -t mysagw/case/templates/application.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/identity/templates/identity-labels.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/accounting/templates/accounting-cover.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/case/templates/acknowledgement-de.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/case/templates/acknowledgement-fr.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/case/templates/acknowledgement-en.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/case/templates/credit-approval-de.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/case/templates/credit-approval-fr.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/case/templates/credit-approval-en.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/case/templates/application.docx
 ```
 
 ## Contributing

api/mysagw/accounting/queries/get_document_id.gql

@@ -0,0 +1,15 @@
+query DocumentId ($case_id: ID!) {
+  node(id: $case_id) {
+    ... on Case {
+      additionalData: workItems(filter: [{task: "additional-data-form"}], first: 1) {
+        edges {
+          node {
+            document {
+              id
+            }
+          }
+        }
+      }
+    }
+  }
+}

api/mysagw/accounting/queries/get_receipts.gql

@@ -1,37 +1,10 @@
-query Receipts($case_id: ID!) {
+query Receipts($case_id: ID!, $document_id: ID!) {
   node(id: $case_id) {
     ... on Case {
-      document {
-        form {
-          name
-        }
-      }
       additionalData: workItems(filter: [{task: "additional-data-form"}], first: 1) {
         edges {
           node {
             document {
-              quittungen: answers(filter: [{question: "additional-data-quittungen"}]) {
-                edges {
-                  node {
-                    ... on TableAnswer {
-                      value {
-                        answers(filter: [{question: "additional-data-row-quittung"}]) {
-                          edges {
-                            node {
-                              ... on FilesAnswer {
-                                value {
-                                  downloadUrl
-                                  metadata
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
               applicant_name: answers(filter: [{question: "additional-data-name"}]) {
                 edges {
                   node {
@@ -113,11 +86,33 @@ query Receipts($case_id: ID!) {
                   }
                 }
               }
+              answers(filter: [{visibleInContext: true}]) {
+                edges {
+                  node {
+                    ...FieldAnswer
+                  }
+                }
+              }
+              form {
+                slug
+                name
+                questions(filter: [{isArchived: false}, {visibleInDocument: $document_id}]) {
+                  edges {
+                    node {
+                      __typename
+                      ...FieldQuestion
+                    }
+                  }
+                }
+              }
             }
           }
         }
       }
       main: document {
+        form {
+          name
+        }
         dossierno: answers(filter: [{question: "dossier-nr"}]) {
           edges {
             node {
@@ -140,7 +135,11 @@ query Receipts($case_id: ID!) {
           edges {
             node {
               ... on StringAnswer {
-                value
+                stringValue: value
+                question {
+                  __typename
+                  ...SimpleQuestion
+                }
               }
             }
           }