udata 10.1.3.dev34195__py2.py3-none-any.whl → 10.1.3.dev34219__py2.py3-none-any.whl

udata/core/dataset/api.py

@@ -62,7 +62,12 @@ from .exceptions import (
     SchemasCacheUnavailableException,
     SchemasCatalogNotFoundException,
 )
-from .forms import CommunityResourceForm, DatasetForm, ResourceForm, ResourcesListForm
+from .forms import (
+    CommunityResourceForm,
+    DatasetForm,
+    ResourceFormWithoutId,
+    ResourcesListForm,
+)
 from .models import (
     Checksum,
     CommunityResource,
@@ -379,8 +384,9 @@ class ResourcesAPI(API):
     def post(self, dataset):
         """Create a new resource for a given dataset"""
         ResourceEditPermission(dataset).test()
-        form = api.validate(ResourceForm)
+        form = api.validate(ResourceFormWithoutId)
         resource = Resource()
+
         if form._fields.get("filetype").data != "remote":
             api.abort(400, "This endpoint only supports remote resources")
         form.populate_obj(resource)
@@ -545,10 +551,19 @@ class ResourceAPI(ResourceMixin, API):
         """Update a given resource on a given dataset"""
         ResourceEditPermission(dataset).test()
         resource = self.get_resource_or_404(dataset, rid)
-        form = api.validate(ResourceForm, resource)
+        form = api.validate(ResourceFormWithoutId, resource)
+
+        # ensure filetype is not modified after creation
+        if (
+            form._fields.get("filetype").data
+            and form._fields.get("filetype").data != resource.filetype
+        ):
+            abort(400, "Cannot modify filetype after creation")
+
         # ensure API client does not override url on self-hosted resources
         if resource.filetype == "file":
             form._fields.get("url").data = resource.url
+
         # populate_obj populates existing resource object with the content of the form.
         # update_resource saves the updated resource dict to the database
         # the additional dataset.save is required as we update the last_modified date.

udata/core/dataset/forms.py

@@ -72,7 +72,7 @@ class BaseResourceForm(ModelForm):
         [validators.DataRequired()],
         choices=list(RESOURCE_FILETYPES.items()),
         default="file",
-        description=_("Whether the resource is an uploaded file, " "a remote file or an API"),
+        description=_("Whether the resource is an uploaded file, a remote file or an API"),
     )
     type = fields.RadioField(
         _("Type"),
@@ -89,7 +89,7 @@ class BaseResourceForm(ModelForm):
     checksum = fields.FormField(ChecksumForm)
     mime = fields.StringField(
         _("Mime type"),
-        description=_("The mime type associated to the extension. " "(ex: text/plain)"),
+        description=_("The mime type associated to the extension. (ex: text/plain)"),
     )
     filesize = fields.IntegerField(
         _("Size"), [validators.optional()], description=_("The file size in bytes")
@@ -104,6 +104,10 @@ class ResourceForm(BaseResourceForm):
     id = fields.UUIDField()
 
 
+class ResourceFormWithoutId(BaseResourceForm):
+    model_class = Resource
+
+
 class CommunityResourceForm(BaseResourceForm):
     model_class = CommunityResource
 
@@ -145,7 +149,7 @@ class DatasetForm(ModelForm):
     description = fields.MarkdownField(
         _("Description"),
         [validators.DataRequired(), validators.Length(max=DESCRIPTION_SIZE_LIMIT)],
-        description=_("The details about the dataset " "(collection process, specifics...)."),
+        description=_("The details about the dataset (collection process, specifics...)."),
     )
     license = fields.ModelSelectField(_("License"), model=License, allow_blank=True)
     frequency = fields.SelectField(
@@ -168,7 +172,7 @@ class DatasetForm(ModelForm):
     tags = fields.TagField(_("Tags"), description=_("Some taxonomy keywords"))
     private = fields.BooleanField(
         _("Private"),
-        description=_("Restrict the dataset visibility to you or " "your organization only."),
+        description=_("Restrict the dataset visibility to you or your organization only."),
     )
 
     owner = fields.CurrentUserField()

udata/core/dataset/models.py

@@ -638,6 +638,9 @@ class Dataset(WithMetrics, DatasetBadgeMixin, Owned, db.Document):
         if self.frequency in LEGACY_FREQUENCIES:
             self.frequency = LEGACY_FREQUENCIES[self.frequency]
 
+        if len(set(res.id for res in self.resources)) != len(self.resources):
+            raise MongoEngineValidationError(f"Duplicate resource ID in dataset #{self.id}.")
+
         for key, value in self.extras.items():
             if not key.startswith("custom:"):
                 continue
@@ -897,6 +900,9 @@ class Dataset(WithMetrics, DatasetBadgeMixin, Owned, db.Document):
     def add_resource(self, resource):
         """Perform an atomic prepend for a new resource"""
         resource.validate()
+        if resource.id in [r.id for r in self.resources]:
+            raise MongoEngineValidationError("Cannot add resource with already existing ID")
+
         self.update(
             __raw__={"$push": {"resources": {"$each": [resource.to_mongo()], "$position": 0}}}
         )