Setup codecov and add coverage for CSV branch import.

.github/workflows/default.yml

@@ -63,10 +63,19 @@ jobs:
         echo 'MAPIT_DB_HOST: localhost' >> conf/general.yml
         echo 'DJANGO_SECRET_KEY: secret' >> conf/general.yml
 
+    - name: Run migrations
+      env:
+        SECRET_KEY: 'secret'
+        DATABASE_URL: 'postgis://postgres:password@localhost/mapit'
+      run: python manage.py migrate
 
-    - name: Run tests
+    - name: Run tests with coverage
       env:
         SECRET_KEY: 'secret'
         DATABASE_URL: 'postgis://postgres:password@localhost/mapit'
-        COBRAND: 'cobrand_hackney'
-      run: python manage.py test
+      run: coverage run manage.py test
+
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v3
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

mapit_labour/importers.py

@@ -187,6 +187,7 @@ def handle_rows(self, csv: DictReader):
         parents = self._load_parents(parent_gss_codes)
         branch_count = len(branches)
         for i, branch in enumerate(branches.values(), start=1):
+            created_area_for_branch = False
             self.update_progress(f"Working on area {i} of {branch_count}")
             parent_area = parents.get(branch["parent_gss_code"])
 
@@ -218,6 +219,7 @@ def handle_rows(self, csv: DictReader):
                     parent_area=parent_area,
                 )
                 self.created += 1
+                created_area_for_branch = True
 
             a.codes.update_or_create(
                 type=gss_codetype, defaults={"code": branch["area_gss"]}
@@ -262,6 +264,8 @@ def handle_rows(self, csv: DictReader):
                     f"Branch {branch['area_id']} doesn't overlap with parent area ({branch['parent_gss_code']}), not creating."
                 )
                 a.delete()
+                if created_area_for_branch:
+                    self.created -= 1
             elif area_area < 50000:
                 self.warnings.append(
                     f"Area {a.id} (branch {branch['area_id']}) has a small geographic area ({int(area_area)} ㎡)"

mapit_labour/management/commands/mapit_labour_import_branches.py

@@ -30,7 +30,7 @@ def handle_label(self, label: str, **options):
         )
         if result["error"]:
             raise CommandError(result["error"])
-        print(f"Created: {result['created']}\nUpdated: {result['updated']}")
+        self.stdout.write(f"Created: {result['created']}\nUpdated: {result['updated']}")
         if result["warnings"]:
-            print(f"Warnings: {len(result['warnings'])}")
-            print("\n".join(result["warnings"]))
+            self.stdout.write(f"Warnings: {len(result['warnings'])}")
+            self.stdout.write("\n".join(result["warnings"]))