Merge pull request #216 from OpenImaging/remove-site

Remove site model

miqa/core/admin.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from django.contrib import admin
 
-from .models import Evaluation, Experiment, Image, Project, Scan, ScanDecision, Site
+from .models import Evaluation, Experiment, Image, Project, Scan, ScanDecision
 
 
 @admin.register(Experiment)
@@ -51,16 +51,3 @@ class ProjectAdmin(admin.ModelAdmin):
     )
     list_filter = ('created', 'modified', 'creator')
     search_fields = ('name',)
-
-
-@admin.register(Site)
-class SiteAdmin(admin.ModelAdmin):
-    list_display = (
-        'id',
-        'created',
-        'modified',
-        'name',
-        'creator',
-    )
-    list_filter = ('created', 'modified', 'creator')
-    search_fields = ('name',)

miqa/core/migrations/0017_remove_site.py

@@ -0,0 +1,16 @@
+# Generated by Django 3.2.8 on 2021-10-29 19:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0016_scan_decision'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='Site',
+        ),
+    ]

miqa/core/models/__init__.py

@@ -4,14 +4,12 @@
 from .project import Project
 from .scan import Scan
 from .scan_decision import ScanDecision
-from .site import Site
 
 __all__ = [
     'Experiment',
     'Image',
     'Scan',
     'Evaluation',
     'Project',
-    'Site',
     'ScanDecision',
 ]

miqa/core/rest/__init__.py

@@ -6,7 +6,6 @@
 from .project import ProjectViewSet
 from .scan import ScanViewSet
 from .scan_decision import ScanDecisionViewSet
-from .site import SiteViewSet
 from .user import UserViewSet
 
 __all__ = [
@@ -16,7 +15,6 @@
     'LogoutView',
     'ProjectViewSet',
     'ScanViewSet',
-    'SiteViewSet',
     'UserViewSet',
     'ScanDecisionViewSet',
     'EmailView',

miqa/core/tests/conftest.py

@@ -11,7 +11,6 @@
     ProjectFactory,
     ScanDecisionFactory,
     ScanFactory,
-    SiteFactory,
     UserFactory,
 )
 
@@ -53,7 +52,6 @@ def generator():
 
 register(ScanDecisionFactory)
 register(UserFactory)
-register(SiteFactory)
 register(ProjectFactory)
 register(ExperimentFactory)
 register(ScanFactory)

miqa/core/tests/factories.py

@@ -1,7 +1,7 @@
 from django.contrib.auth.models import User
 import factory
 
-from miqa.core.models import Experiment, Image, Project, Scan, ScanDecision, Site
+from miqa.core.models import Experiment, Image, Project, Scan, ScanDecision
 
 
 class UserFactory(factory.django.DjangoModelFactory):
@@ -14,16 +14,6 @@ class Meta:
     last_name = factory.Faker('last_name')
 
 
-class SiteFactory(factory.django.DjangoModelFactory):
-    class Meta:
-        model = Site
-
-    id = factory.Faker('uuid4')
-    name = factory.Faker('word')
-
-    creator = factory.SubFactory(UserFactory)
-
-
 class ProjectFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Project

miqa/urls.py

@@ -14,7 +14,6 @@
     ProjectViewSet,
     ScanDecisionViewSet,
     ScanViewSet,
-    SiteViewSet,
     UserViewSet,
 )
 
@@ -23,7 +22,6 @@
 router.register('experiments', ExperimentViewSet)
 router.register('scans', ScanViewSet)
 router.register('images', ImageViewSet)
-router.register('sites', SiteViewSet)
 router.register('users', UserViewSet)
 router.register('scan-decisions', ScanDecisionViewSet)