Skip to content

Commit

Permalink
remove autoonetone
Browse files Browse the repository at this point in the history
  • Loading branch information
nicokant committed Nov 21, 2023
1 parent 64e130e commit f7712da
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 56 deletions.
49 changes: 0 additions & 49 deletions metadata_catalogue/core/fields.py

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def to_metadata(xml_path: pathlib.Path, dataset: Dataset):
with open(str(xml_path)) as eml:
soup = BeautifulSoup(eml, features="lxml-xml")
with transaction.atomic():
metadata = dataset.metadata
metadata = dataset.get_metadata()

dataset = soup.find("dataset")
metadata.title = text_or_null(dataset.find("title"))
Expand Down
2 changes: 1 addition & 1 deletion metadata_catalogue/datasets/libs/darwincore/mapping.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def to_content(xml_path, dataset):
with open(str(meta_path)) as meta:
soup = BeautifulSoup(meta, features="lxml-xml")
with transaction.atomic():
content = dataset.content
content = dataset.get_content()
extensions = []
core = SourceLayer(soup.find("core"), xml_path)
for extension in soup.find_all("extension"):
Expand Down
5 changes: 2 additions & 3 deletions metadata_catalogue/datasets/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from django.db import migrations, models
import django.db.models.deletion
import django.db.models.functions.comparison
import metadata_catalogue.core.fields
import uuid


Expand Down Expand Up @@ -237,7 +236,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name="metadata",
name="dataset",
field=metadata_catalogue.core.fields.AutoOneToOneField(
field=models.OneToOneField(
blank=True,
null=True,
on_delete=django.db.models.deletion.CASCADE,
Expand Down Expand Up @@ -457,7 +456,7 @@ class Migration(migrations.Migration):
("gdal_vrt_definition", models.TextField(blank=True, null=True)),
(
"dataset",
metadata_catalogue.core.fields.AutoOneToOneField(
models.OneToOneField(
on_delete=django.db.models.deletion.CASCADE, related_name="content", to="datasets.dataset"
),
),
Expand Down
14 changes: 12 additions & 2 deletions metadata_catalogue/datasets/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
from django_lifecycle import AFTER_CREATE, AFTER_DELETE, BEFORE_SAVE, LifecycleModel, hook
from solo.models import SingletonModel

from metadata_catalogue.core.fields import AutoOneToOneField

from .libs.iso.mapping import ISOMapping
from .managers import DatasetManager

Expand Down Expand Up @@ -68,6 +66,18 @@ def set_fetch_message(self, message, *args, append=False, success=None, logger_f

self.save()

def get_metadata(self):
if hasattr(self, "metadata"):
return self.metadata
else:
return Metadata.objects.create(dataset=self)

def get_content(self):
if hasattr(self, "content"):
return self.metadata
else:
return Content.objects.create(dataset=self)

class Meta:
verbose_name = _("Dataset")
constraints = [
Expand Down

0 comments on commit f7712da

Please sign in to comment.