Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change OnetoOne Legacy Export to OnetoMany #104

Merged
merged 1 commit into from
Apr 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions infoscience_exports/exports/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ class LegacyExportInline(admin.StackedInline):
model = LegacyExport
can_delete = False
extra = 0
readonly_fields = ('legacy_url',
readonly_fields = ('legacy_id',
'legacy_url',
'language',
'referenced_url',
'origin',
Expand All @@ -89,7 +90,7 @@ def get_formsets_with_inlines(self, request, obj=None):
for inline in self.get_inline_instances(request, obj):
if obj is not None:
try:
obj.legacyexport
obj.legacyexport_set.all()
yield inline.get_formset(request, obj), inline
except LegacyExport.DoesNotExist:
pass
Expand Down
44 changes: 44 additions & 0 deletions infoscience_exports/exports/migrations/0018_auto_20180426_0458.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Generated by Django 2.0.3 on 2018-04-26 02:58

from django.db import migrations, models
import django.db.models.deletion


def remove_existing_legacy_export(apps, schema_editor):
# We can't import the Person model directly as it may be a newer
# version than this migration expects. We use the historical version.
LegacyExport = apps.get_model('exports', 'LegacyExport')
for legacy_export in LegacyExport.objects.all():
legacy_export.export.delete()


class Migration(migrations.Migration):

dependencies = [
('exports', '0017_legacyexport_legacy_id'),
]

operations = [
migrations.RunPython(remove_existing_legacy_export),
migrations.DeleteModel('LegacyExport'),
migrations.CreateModel(
name='LegacyExport',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True,
serialize=False, verbose_name='ID')),
('export', models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to='exports.Export')),
('legacy_id', models.IntegerField(blank=True, null=True)),
('content_delta', models.IntegerField(blank=True, null=True)),
('legacy_url', models.TextField()),
('language', models.TextField()),
('referenced_url', models.TextField()),
('origin', models.TextField(
choices=[('OTHER', ''), ('JAHIA', 'Jahia'),
('PEOPLE', 'People')])),
('origin_sciper', models.TextField()),
('raw_csv_entry', models.TextField()),
],
),
]
5 changes: 2 additions & 3 deletions infoscience_exports/exports/models/export.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,9 @@ class LegacyExport(models.Model):
('PEOPLE', 'People'),
)

export = models.OneToOneField(
export = models.ForeignKey(
Export,
on_delete=models.CASCADE,
primary_key=True,
on_delete=models.CASCADE
)

# allow null as we may not have an export
Expand Down