Models refactoring

1 files changed, 11 insertions, 108 deletions

diff --git a/commcrawler/migrations/0001_initial.py b/commcrawler/migrations/0001_initial.py
index 1468584..0b4e561 100644
--- a/commcrawler/migrations/0001_initial.py
+++ b/commcrawler/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2019-07-31 07:48
+# Generated by Django 1.11 on 2019-07-31 08:21
 from __future__ import unicode_literals
 
 import datetime
@@ -12,36 +12,11 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        ('commorganization', '0001_initial'),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Area',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=200, verbose_name='Name')),
-                ('population', models.IntegerField(blank=True, null=True, verbose_name='Population')),
-                ('reference', models.CharField(blank=True, help_text='For instance, INSEE code for towns', max_length=100, null=True, verbose_name='Reference')),
-            ],
-            options={
-                'verbose_name': 'Area',
-                'verbose_name_plural': 'Areas',
-                'ordering': ('name',),
-            },
-        ),
-        migrations.CreateModel(
-            name='AreaType',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=200, verbose_name='Name')),
-            ],
-            options={
-                'verbose_name': 'Area type',
-                'verbose_name_plural': 'Area types',
-                'ordering': ('name',),
-            },
-        ),
-        migrations.CreateModel(
             name='Crawl',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
@@ -50,11 +25,12 @@ class Migration(migrations.Migration):
                 ('started', models.DateTimeField(blank=True, null=True, verbose_name='Start date')),
                 ('ended', models.DateTimeField(blank=True, null=True, verbose_name='End date')),
                 ('status', models.CharField(choices=[('C', 'Created'), ('P', 'In progress'), ('F', 'Finished')], default='C', max_length=1)),
+                ('targets', models.ManyToManyField(blank=True, to='commorganization.Target')),
             ],
             options={
-                'verbose_name': 'Crawl',
-                'verbose_name_plural': 'Crawls',
                 'ordering': ('created', 'name'),
+                'verbose_name_plural': 'Crawls',
+                'verbose_name': 'Crawl',
             },
         ),
         migrations.CreateModel(
@@ -64,8 +40,8 @@ class Migration(migrations.Migration):
                 ('link', models.URLField(verbose_name='Link')),
             ],
             options={
-                'verbose_name': 'Crawl link',
                 'verbose_name_plural': 'Crawl links',
+                'verbose_name': 'Crawl link',
             },
         ),
         migrations.CreateModel(
@@ -74,10 +50,12 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('number', models.IntegerField(default=1, verbose_name='Number')),
                 ('crawl', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='commcrawler.Crawl', verbose_name='Crawl')),
+                ('destination', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='relation_destination', to='commorganization.Target', verbose_name='Destination')),
+                ('source', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='relation_source', to='commorganization.Target', verbose_name='Source')),
             ],
             options={
-                'verbose_name': 'Crawl relation',
                 'verbose_name_plural': 'Crawl relations',
+                'verbose_name': 'Crawl relation',
             },
         ),
         migrations.CreateModel(
@@ -102,91 +80,16 @@ class Migration(migrations.Migration):
                 ('is_online', models.BooleanField(default=False, verbose_name='Website is online')),
                 ('redirection', models.URLField(blank=True, null=True, verbose_name='Redirection')),
                 ('crawl', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='commcrawler.Crawl', verbose_name='Crawl')),
+                ('target', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='commorganization.Target', verbose_name='Target')),
             ],
             options={
-                'verbose_name': 'Crawl result',
                 'verbose_name_plural': 'Crawl results',
+                'verbose_name': 'Crawl result',
             },
         ),
-        migrations.CreateModel(
-            name='Organization',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=200, verbose_name='Name')),
-                ('address', models.TextField(blank=True, null=True, verbose_name='Address')),
-                ('area', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='commcrawler.Area', verbose_name='Area')),
-            ],
-            options={
-                'verbose_name': 'Organization',
-                'verbose_name_plural': 'Organizations',
-                'ordering': ('name',),
-            },
-        ),
-        migrations.CreateModel(
-            name='OrganizationType',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=200, verbose_name='Name')),
-                ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='commcrawler.OrganizationType', verbose_name='Parent')),
-            ],
-            options={
-                'verbose_name': 'Organization type',
-                'verbose_name_plural': 'Organization types',
-                'ordering': ('parent__name', 'name'),
-            },
-        ),
-        migrations.CreateModel(
-            name='Target',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=200, verbose_name='Name')),
-                ('url', models.URLField(blank=True, null=True, verbose_name='URL')),
-                ('organization', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='commcrawler.Organization', verbose_name='Organization')),
-            ],
-            options={
-                'verbose_name': 'Target',
-                'verbose_name_plural': 'Targets',
-                'ordering': ('name',),
-            },
-        ),
-        migrations.AddField(
-            model_name='organization',
-            name='organization_type',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='commcrawler.OrganizationType', verbose_name='Type'),
-        ),
-        migrations.AddField(
-            model_name='crawlresult',
-            name='target',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='commcrawler.Target', verbose_name='Target'),
-        ),
-        migrations.AddField(
-            model_name='crawlrelation',
-            name='destination',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='relation_destination', to='commcrawler.Target', verbose_name='Destination'),
-        ),
-        migrations.AddField(
-            model_name='crawlrelation',
-            name='source',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='relation_source', to='commcrawler.Target', verbose_name='Source'),
-        ),
         migrations.AddField(
             model_name='crawllink',
             name='result',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='commcrawler.CrawlResult', verbose_name='Result'),
         ),
-        migrations.AddField(
-            model_name='crawl',
-            name='targets',
-            field=models.ManyToManyField(blank=True, to='commcrawler.Target'),
-        ),
-        migrations.AddField(
-            model_name='area',
-            name='area_type',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='commcrawler.AreaType', verbose_name='Type'),
-        ),
-        migrations.AddField(
-            model_name='area',
-            name='parent',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='commcrawler.Area', verbose_name='Parent'),
-        ),
     ]