Unapplied previous changes

geokey_sapelli/models.py

@@ -1,28 +1,32 @@
 import json
 import csv
+from django.db.models import (
+    Model,
+    OneToOneField,
+    IntegerField,
+    ImageField,
+    ForeignKey,
+    CharField,
+    BooleanField
+)
 
-from django.db import models
-from django.dispatch import receiver
-
-from geokey.projects.models import Project
 from geokey.contributions.models import Observation
-from geokey.contributions.serializers import ContributionSerializer
 
 from .manager import SapelliProjectManager
 
 
-class SapelliProject(models.Model):
+class SapelliProject(Model):
     """
     Represents a Sapelli project. Is usually created by parsing a Sapelli
     decision tree.
     """
-    project = models.OneToOneField(
+    project = OneToOneField(
         'projects.Project',
         primary_key=True,
         related_name='sapelli_project'
     )
-    sapelli_id = models.IntegerField()
-    sapelli_fingerprint = models.IntegerField()
+    sapelli_id = IntegerField()
+    sapelli_fingerprint = IntegerField()
 
     objects = SapelliProjectManager()
 
@@ -112,6 +116,8 @@ def import_from_csv(self, user, form_id, csvfile):
 
                 feature['properties'][key] = value
 
+            from geokey.contributions.serializers import (ContributionSerializer)
+
             try:
                 observation = self.project.observations.get(
                     category_id=form.category.id,
@@ -158,91 +164,64 @@ def import_from_csv(self, user, form_id, csvfile):
         return imported_features, updated_features, ignored_features
 
 
-@receiver(models.signals.post_save, sender=Project)
-def post_save_project(sender, instance, **kwargs):
-    """
-    Receiver that is called after a project is saved. Deletes related Sapelli
-    project, when original project is marked as deleted.
-    """
-    if instance.status == 'deleted':
-        try:
-            project = SapelliProject.objects.get(project=instance)
-            project.delete()
-        except SapelliProject.DoesNotExist:
-            pass
-
-
-@receiver(models.signals.pre_delete, sender=Project)
-def pre_delete_project(sender, instance, **kwargs):
-    """
-    Receiver that is called after a project is deleted. Deletes related Sapelli
-    project.
-    """
-    try:
-        project = SapelliProject.objects.get(project=instance)
-        project.delete()
-    except SapelliProject.DoesNotExist:
-        pass
-
-
-class SapelliForm(models.Model):
+class SapelliForm(Model):
     """
     Represents a Sapelli form. Is usually created by parsing a Sapelli
     decision tree.
     """
-    category = models.OneToOneField(
+    category = OneToOneField(
         'categories.Category',
         primary_key=True,
         related_name='sapelli_form'
     )
-    sapelli_project = models.ForeignKey(
+    sapelli_project = ForeignKey(
         'SapelliProject',
         related_name='forms'
     )
-    sapelli_id = models.CharField(max_length=255)
+    sapelli_id = CharField(max_length=255)
 
 
-class LocationField(models.Model):
+class LocationField(Model):
     """
     Represents a Location field.
     """
-    sapelli_form = models.ForeignKey(
+    sapelli_form = ForeignKey(
         'SapelliForm',
         related_name='location_fields'
     )
-    sapelli_id = models.CharField(max_length=255)
+    sapelli_id = CharField(max_length=255)
 
 
-class SapelliField(models.Model):
+class SapelliField(Model):
     """
     Represents a Sapelli input option, can be a Text input, a list or a choice
     root element.
     """
-    sapelli_form = models.ForeignKey(
+    sapelli_form = ForeignKey(
         'SapelliForm',
         related_name='fields'
     )
-    field = models.ForeignKey(
+    field = ForeignKey(
         'categories.Field',
         related_name='sapelli_field'
     )
-    sapelli_id = models.CharField(max_length=255)
-    truefalse = models.BooleanField(default=False)
+    sapelli_id = CharField(max_length=255)
+    truefalse = BooleanField(default=False)
 
 
-class SapelliItem(models.Model):
+class SapelliItem(Model):
     """
     Represents a Sapelli Choice element that has no Choice elements as childs.
     Is usually created by parsing a Sapelli decision tree.
     """
-    lookup_value = models.OneToOneField(
+    lookup_value = OneToOneField(
         'categories.LookupValue',
         primary_key=True,
         related_name='sapelli_item'
     )
-    image = models.ImageField(upload_to='sapelli/item', null=True)
-    number = models.IntegerField()
-    sapelli_choice_root = models.ForeignKey(
+    image = ImageField(upload_to='sapelli/item', null=True)
+    number = IntegerField()
+    sapelli_choice_root = ForeignKey(
         'SapelliField',
         related_name='items'
     )

geokey_sapelli/tests/test_models.py

@@ -4,17 +4,12 @@
 from django.test import TestCase
 
 from geokey.users.tests.model_factories import UserFactory
-from geokey.projects.models import Project
-from geokey.projects.tests.model_factories import ProjectFactory
 
-from ..models import SapelliProject, post_save_project, pre_delete_project
-from .model_factories import SapelliProjectFactory, create_full_project
+from .model_factories import create_full_project
 
 
-class SapelliProjectTest(TestCase):
-
+class ProjectTest(TestCase):
     def test_import_from_csv(self):
-
         user = UserFactory.create()
         sapelli_project = create_full_project(user)
 
@@ -43,36 +38,3 @@ def test_import_from_csv(self):
         self.assertEqual(updated, 2)
         self.assertEqual(ignored, 1)
         self.assertEqual(sapelli_project.project.observations.count(), 5)
-
-
-class ProjectSaveTest(TestCase):
-
-    def test_post_save_when_project_made_deleted(self):
-
-        project = ProjectFactory.create(status='active')
-        sapelli_project = SapelliProjectFactory.create(project=project)
-
-        project.status = 'deleted'
-        project.save
-
-        post_save_project(Project, instance=project)
-
-        self.assertEqual(
-            SapelliProject.objects.filter(pk=sapelli_project.id).exists(),
-            False
-        )
-
-
-class ProjectDeleteTest(TestCase):
-
-    def test_pre_delete_project(self):
-
-        project = ProjectFactory.create(status='active')
-        sapelli_project = SapelliProjectFactory.create(project=project)
-
-        pre_delete_project(Project, instance=project)
-
-        self.assertEqual(
-            SapelliProject.objects.filter(pk=sapelli_project.id).exists(),
-            False
-        )