#422-is-published-property

core/migrations/0033_auto_20230515_1353.py

@@ -0,0 +1,32 @@
+# Generated by Django 3.2.19 on 2023-05-15 11:53
+
+import core.models.utils
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0032_auto_20230508_1200'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='cohort',
+            old_name='is_published',
+            new_name='_is_published',
+        ),
+        migrations.RenameField(
+            model_name='partner',
+            old_name='is_published',
+            new_name='_is_published',
+        ),
+        migrations.RemoveField(
+            model_name='dataset',
+            name='is_published',
+        ),
+        migrations.RemoveField(
+            model_name='project',
+            name='is_published',
+        ),
+    ]

core/models/cohort.py

@@ -1,10 +1,10 @@
 from django.db import models
 from django.conf import settings
 
-from .utils import CoreTrackedModel, TextFieldWithInputWidget
+from .utils import CoreTrackedDBModel, TextFieldWithInputWidget
 
 
-class Cohort(CoreTrackedModel):
+class Cohort(CoreTrackedDBModel):
     class Meta:
         app_label = 'core'
         get_latest_by = "added"

core/models/dataset.py

@@ -60,6 +60,11 @@ class AppMeta:
                                     verbose_name='Sensitivity class',
                                     help_text='Sensitivity denotes the security classification of this dataset.')
 
+    @property
+    def is_published(self):
+        exposures_list = self.exposures.all()
+        return len(exposures_list) > 0
+
     @property
     def data_types(self):
         all_data_types = set()

core/models/partner.py

@@ -3,7 +3,7 @@
 from django_countries.fields import CountryField
 
 from model_utils import Choices
-from .utils import CoreTrackedModel, TextFieldWithInputWidget
+from .utils import CoreTrackedDBModel, TextFieldWithInputWidget
 
 from elixir_daisy import settings
 
@@ -21,7 +21,7 @@
 )
 
 
-class Partner(CoreTrackedModel):
+class Partner(CoreTrackedDBModel):
     """
     Represents a partner.
       {

core/models/project.py

@@ -151,7 +151,9 @@ def __str__(self):
         return self.acronym or self.title or "undefined"
 
 
-
+    @property
+    def is_published(self):
+        return any(dataset.is_published for dataset in self.datasets.all())
 
     def to_dict(self):
         contact_dicts = []

core/models/utils.py

@@ -1,3 +1,4 @@
+from abc import abstractmethod
 from json import loads
 from json.decoder import JSONDecodeError
 
@@ -11,19 +12,21 @@
 
 COMPANY = getattr(settings, "COMPANY", 'Company')
 
+
 def validate_json(value):
     if len(value) == 0:
         return value
 
     try:
         loads(value)
         if '{' not in value:  # Very inaccurate, but should do the trick when the user tries to save e.g. '123'
-            raise ValidationError(f'`scientific_metadata` field must be a valid JSON containing a dictionary!')    
+            raise ValidationError(f'`scientific_metadata` field must be a valid JSON containing a dictionary!')
         return value
     except JSONDecodeError as ex:
         msg = str(ex)
         raise ValidationError(f'`scientific_metadata` field must contain a valid JSON! ({msg})')
 
+
 class classproperty(property):
     def __get__(self, cls, owner):
         return self.fget.__get__(None, owner)()
@@ -43,11 +46,6 @@ class CoreTrackedModel(CoreModel):
         blank=True,
         null=True,
         max_length=20)
-
-    is_published = models.BooleanField(
-        default=False,
-        blank=False,
-        verbose_name='Is published?')
 
     scientific_metadata = models.TextField(
         default='{}',
@@ -56,9 +54,14 @@ class CoreTrackedModel(CoreModel):
         verbose_name='Additional scientific metadata (in JSON format)',
         validators=[validate_json]  # This will work in ModelForm only
     )
+
     class Meta:
         abstract = True
 
+    @abstractmethod
+    def is_published(self):
+        pass
+
     def publish(self, save=True):
         generate_id_function_path = getattr(settings, 'IDSERVICE_FUNCTION')
         generate_id_function = import_string(generate_id_function_path)
@@ -87,6 +90,25 @@ def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
 
 
+class CoreTrackedDBModel(CoreTrackedModel):
+    _is_published = models.BooleanField(
+        default=False,
+        blank=False,
+        verbose_name='Is published?')
+
+    class Meta:
+        abstract = True
+    @property
+    def is_published(self):
+        # Getter method
+        return self._is_published
+
+    @is_published.setter
+    def is_published(self, value):
+        # Setter method
+        self._is_published = value
+
+
 class TextFieldWithInputWidget(TextField):
 
     def formfield(self, **kwargs):
@@ -105,11 +127,10 @@ class HashedField(models.CharField):
     A custom field that will store a hash of the provided value.
     """
     description = "Keeps the hash of the string in the DB"
-    
+
     def pre_save(self, model_instance, add):
         """
         This function is called when the value is about to be saved to the DB. We hash the value and return it.
         """
         value = getattr(model_instance, self.attname)
         return make_password(value, salt=settings.SECRET_KEY)
-

elixir_daisy/settings.py

@@ -282,6 +282,7 @@
         'consent_status',
         'data_types',
         'deidentification_method',
+        'is_published',
     ),
     'contract': (
         'contacts',

web/templates/search/_items/datasets.html

@@ -6,6 +6,7 @@ <h2 class="card-title">
                   <a href="{% url 'dataset' pk=dataset.pk %}">{{ dataset.title }}</a>
                 </h2>
                 <ul class="card-text">
+                    <li><strong>Published:</strong> {{ dataset.is_published | yesno }}</li>
                     <li><strong>Datatypes:</strong>
                         {% for datatype in dataset.data_types %}
                             <span class="badge badge-pill badge-secondary">{{ datatype }}</span>