Merge pull request #53 from unicef/staging

Master

.flake8

@@ -18,6 +18,8 @@ ignore =
     # too complex # TODO: fix this
     C901,
     # TODO
-    F401,
+    # F401,
     F403,
 
+per-file-ignores =
+    tests/extras/testutils/factories/__init__.py: F401

.github/workflows/ci.yml

@@ -4,10 +4,12 @@ on:
   push:
     branches:
     - develop
+    - staging
     - master
   pull_request:
     branches:
     - develop
+    - staging
     - master
 
 jobs:
@@ -162,6 +164,7 @@ jobs:
         github.event_name == 'push' &&
         (
           github.ref == 'refs/heads/develop' ||
+          github.ref == 'refs/heads/staging' ||
           github.ref == 'refs/heads/master'
         )
       steps:
@@ -198,4 +201,4 @@ jobs:
                 echo "Failed to trigger deploy for pipeline $pipeline"
                 exit 1
               fi
-            done
+            done

.gitignore

@@ -17,4 +17,9 @@ coverage.xml
 !.mypy.ini
 !.pre-commit-config.yaml
 
-pdm.toml
+pdm.toml
+.coverage
+.env
+.envrc
+.pdm-python
+.tox/

.mypy.ini

@@ -6,7 +6,7 @@ files = src/hope_country_report
 ;        ~billing
 ;exclude = (?x)(^\~management$)
 ;exclude = (?x)(.*/power_query/.*)
-exclude = (?x)(.*/management/.*)
+exclude = (?x)(.*/management|factories/.*)
 
 install_types = true
 show_error_codes = true

LICENSE

@@ -671,4 +671,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.

compose.prd.yml

@@ -131,4 +131,4 @@ services:
       db:
         condition: service_healthy
       redis:
-        condition: service_healthy
+        condition: service_healthy

compose.yml

@@ -124,4 +124,4 @@ services:
       db:
         condition: service_healthy
       redis:
-        condition: service_healthy
+        condition: service_healthy

docker/wait-for-it.sh

@@ -179,4 +179,4 @@ if [[ $WAITFORIT_CLI != "" ]]; then
     exec "${WAITFORIT_CLI[@]}"
 else
     exit $WAITFORIT_RESULT
-fi
+fi

src/hope_country_report/api/serializers.py

@@ -25,7 +25,9 @@ class Meta:
 
     @cached_property
     def selected_office(self) -> CountryOffice:
-        co_slug: str = self.context["view"].kwargs[self.co_key]
+        co_slug: str = self.context["view"].kwargs.get(self.co_key)
+        if not co_slug:
+            raise serializers.ValidationError("Country office slug is required.")
         return CountryOffice.objects.get(slug=co_slug)
 
     def get_office(self, obj: "Model"):