Split model.py into submodules

app/models/__init__.py

@@ -0,0 +1,3 @@
+from .image_upload import ImageUpload, image_directory_path
+from .project import Project
+from .task import Task, validate_task_options, gcp_directory_path

app/models/image_upload.py

@@ -0,0 +1,16 @@
+from .task import Task, assets_directory_path
+from django.db import models
+
+def image_directory_path(image_upload, filename):
+    return assets_directory_path(image_upload.task.id, image_upload.task.project.id, filename)
+
+
+class ImageUpload(models.Model):
+    task = models.ForeignKey(Task, on_delete=models.CASCADE, help_text="Task this image belongs to")
+    image = models.ImageField(upload_to=image_directory_path, help_text="File uploaded by a user")
+
+    def __str__(self):
+        return self.image.name
+
+    def path(self):
+        return self.image.path

app/models/project.py

@@ -0,0 +1,75 @@
+import logging
+
+from django.contrib.auth.models import User
+from django.db import models
+from django.db.models import Q
+from django.db.models import signals
+from django.dispatch import receiver
+from django.utils import timezone
+from guardian.models import GroupObjectPermissionBase
+from guardian.models import UserObjectPermissionBase
+from guardian.shortcuts import get_perms_for_model, assign_perm
+
+from app import pending_actions
+
+from nodeodm import status_codes
+
+logger = logging.getLogger('app.logger')
+
+
+class Project(models.Model):
+    owner = models.ForeignKey(User, on_delete=models.PROTECT, help_text="The person who created the project")
+    name = models.CharField(max_length=255, help_text="A label used to describe the project")
+    description = models.TextField(default="", blank=True, help_text="More in-depth description of the project")
+    created_at = models.DateTimeField(default=timezone.now, help_text="Creation date")
+    deleting = models.BooleanField(db_index=True, default=False, help_text="Whether this project has been marked for deletion. Projects that have running tasks need to wait for tasks to be properly cleaned up before they can be deleted.")
+
+    def delete(self, *args):
+        # No tasks?
+        if self.task_set.count() == 0:
+            # Just delete normally
+            logger.info("Deleted project {}".format(self.id))
+            super().delete(*args)
+        else:
+            # Need to remove all tasks before we can remove this project
+            # which will be deleted on the scheduler after pending actions
+            # have been completed
+            self.task_set.update(pending_action=pending_actions.REMOVE)
+            self.deleting = True
+            self.save()
+            logger.info("Tasks pending, set project {} deleting flag".format(self.id))
+
+    def __str__(self):
+        return self.name
+
+    def tasks(self):
+        return self.task_set.only('id')
+
+    def get_map_items(self):
+        return [task.get_map_items() for task in self.task_set.filter(
+                    status=status_codes.COMPLETED
+                ).filter(Q(orthophoto_extent__isnull=False) | Q(dsm_extent__isnull=False) | Q(dtm_extent__isnull=False))
+                .only('id', 'project_id')]
+
+    class Meta:
+        permissions = (
+            ('view_project', 'Can view project'),
+        )
+
+
+@receiver(signals.post_save, sender=Project, dispatch_uid="project_post_save")
+def project_post_save(sender, instance, created, **kwargs):
+    """
+    Automatically assigns all permissions to the owner. If the owner changes
+    it's up to the user/developer to remove the previous owner's permissions.
+    """
+    for perm in get_perms_for_model(sender).all():
+        assign_perm(perm.codename, instance.owner, instance)
+
+
+class ProjectUserObjectPermission(UserObjectPermissionBase):
+    content_object = models.ForeignKey(Project)
+
+
+class ProjectGroupObjectPermission(GroupObjectPermissionBase):
+    content_object = models.ForeignKey(Project)

app/models/task.py

@@ -3,8 +3,6 @@ import os
 import shutil
 import zipfile
 
-from django.contrib.auth.models import User
-from django.contrib.gis.gdal import GDALException
 from django.contrib.gis.gdal import GDALRaster
 from django.contrib.gis.gdal import OGRGeometry
 from django.contrib.gis.geos import GEOSGeometry
@@ -12,13 +10,7 @@ from django.contrib.postgres import fields
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.db import transaction
-from django.db.models import Q
-from django.db.models import signals
-from django.dispatch import receiver
 from django.utils import timezone
-from guardian.models import GroupObjectPermissionBase
-from guardian.models import UserObjectPermissionBase
-from guardian.shortcuts import get_perms_for_model, assign_perm
 
 from app import pending_actions
 from django.contrib.gis.db.models.fields import GeometryField
@@ -27,10 +19,12 @@ from nodeodm import status_codes
 from nodeodm.exceptions import ProcessingError, ProcessingTimeout, ProcessingException
 from nodeodm.models import ProcessingNode
 from webodm import settings
+from .project import Project
 
 logger = logging.getLogger('app.logger')
 
 
+
 def task_directory_path(taskId, projectId):
     return 'project/{0}/task/{1}/'.format(projectId, taskId)
 
@@ -44,64 +38,6 @@ def assets_directory_path(taskId, projectId, filename):
     return '{0}{1}'.format(task_directory_path(taskId, projectId), filename)
 
 
-class Project(models.Model):
-    owner = models.ForeignKey(User, on_delete=models.PROTECT, help_text="The person who created the project")
-    name = models.CharField(max_length=255, help_text="A label used to describe the project")
-    description = models.TextField(default="", blank=True, help_text="More in-depth description of the project")
-    created_at = models.DateTimeField(default=timezone.now, help_text="Creation date")
-    deleting = models.BooleanField(db_index=True, default=False, help_text="Whether this project has been marked for deletion. Projects that have running tasks need to wait for tasks to be properly cleaned up before they can be deleted.")
-
-    def delete(self, *args):
-        # No tasks?
-        if self.task_set.count() == 0:
-            # Just delete normally
-            logger.info("Deleted project {}".format(self.id))
-            super().delete(*args)
-        else:
-            # Need to remove all tasks before we can remove this project
-            # which will be deleted on the scheduler after pending actions
-            # have been completed
-            self.task_set.update(pending_action=pending_actions.REMOVE)
-            self.deleting = True
-            self.save()
-            logger.info("Tasks pending, set project {} deleting flag".format(self.id))
-
-    def __str__(self):
-        return self.name
-
-    def tasks(self):
-        return self.task_set.only('id')
-
-    def get_map_items(self):
-        return [task.get_map_items() for task in self.task_set.filter(
-                    status=status_codes.COMPLETED
-                ).filter(Q(orthophoto_extent__isnull=False) | Q(dsm_extent__isnull=False) | Q(dtm_extent__isnull=False))
-                .only('id', 'project_id')]
-
-    class Meta:
-        permissions = (
-            ('view_project', 'Can view project'),
-        )
-
-
-@receiver(signals.post_save, sender=Project, dispatch_uid="project_post_save")
-def project_post_save(sender, instance, created, **kwargs):
-    """
-    Automatically assigns all permissions to the owner. If the owner changes
-    it's up to the user/developer to remove the previous owner's permissions.
-    """
-    for perm in get_perms_for_model(sender).all():
-        assign_perm(perm.codename, instance.owner, instance)
-
-
-class ProjectUserObjectPermission(UserObjectPermissionBase):
-    content_object = models.ForeignKey(Project)
-
-
-class ProjectGroupObjectPermission(GroupObjectPermissionBase):
-    content_object = models.ForeignKey(Project)
-
-
 def gcp_directory_path(task, filename):
     return assets_directory_path(task.id, task.project.id, filename)
 
@@ -554,17 +490,3 @@ class Task(models.Model):
             ('view_task', 'Can view task'),
         )
 
-
-def image_directory_path(image_upload, filename):
-    return assets_directory_path(image_upload.task.id, image_upload.task.project.id, filename)
-
-
-class ImageUpload(models.Model):
-    task = models.ForeignKey(Task, on_delete=models.CASCADE, help_text="Task this image belongs to")
-    image = models.ImageField(upload_to=image_directory_path, help_text="File uploaded by a user")
-    
-    def __str__(self):
-        return self.image.name
-
-    def path(self):
-        return self.image.path

app/static/app/js/components/EditTaskPanel.jsx

@@ -49,11 +49,10 @@ class EditTaskPanel extends React.Component {
           dataType: 'json',
           type: 'PATCH'
         }).done((json) => {
+          this.setState({saving: false});
           this.props.onSave(json);
         }).fail(() => {
-          this.setState({error: "Could not update task information. Plese try again."});
-        }).always(() => {
-          this.setState({saving: false});
+          this.setState({saving: false, error: "Could not update task information. Plese try again."});
         });     
     }
 

app/templatetags/processingnode_extras.py

@@ -1,7 +1,7 @@
 from django import template
 from guardian.shortcuts import get_objects_for_user
 
-from app.models import ProcessingNode
+from nodeodm.models import ProcessingNode
 
 register = template.Library()
 

app/tests/test_api_task.py

@@ -18,7 +18,8 @@ from rest_framework.test import APIClient
 from app import pending_actions
 from app import scheduler
 from django.utils import timezone
-from app.models import Project, Task, ImageUpload, task_directory_path, full_task_directory_path
+from app.models import Project, Task, ImageUpload
+from app.models.task import task_directory_path, full_task_directory_path
 from app.tests.classes import BootTransactionTestCase
 from nodeodm import status_codes
 from nodeodm.models import ProcessingNode, OFFLINE_MINUTES