udata 9.1.2.dev30593__py2.py3-none-any.whl → 9.1.2.dev30627__py2.py3-none-any.whl

udata/core/reuse/api.py

@@ -253,7 +253,9 @@ class ReusesSuggestAPI(API):
     def get(self):
         """Reuses suggest endpoint using mongoDB contains"""
         args = suggest_parser.parse_args()
-        reuses = Reuse.objects(deleted=None, private__ne=True, title__icontains=args["q"])
+        reuses = Reuse.objects(
+            archived=None, deleted=None, private__ne=True, title__icontains=args["q"]
+        )
         return [
             {
                 "id": reuse.id,

udata/core/reuse/api_fields.py

@@ -43,6 +43,9 @@ reuse_fields = api.model(
             description="The reuse last modification date", readonly=True
         ),
         "deleted": fields.ISODateTime(description="The deletion date if deleted", readonly=True),
+        "archived": fields.ISODateTime(
+            description="The archivation date if archived", allow_null=True
+        ),
         "datasets": fields.List(fields.Nested(dataset_fields), description="The reused datasets"),
         "organization": fields.Nested(
             org_ref_fields,

udata/core/reuse/csv.py

@@ -21,6 +21,7 @@ class ReuseCsvAdapter(csv.Adapter):
         ("featured", lambda r: r.featured or False),
         "created_at",
         "last_modified",
+        ("archived", lambda r: r.archived or False),
         "topic",
         ("tags", lambda r: ",".join(r.tags)),
         ("datasets", lambda r: ",".join([str(d.id) for d in r.datasets])),

udata/core/reuse/factories.py

@@ -18,6 +18,7 @@ class ReuseFactory(ModelFactory):
     url = factory.LazyAttribute(lambda o: "/".join([faker.url(), faker.unique_string()]))
     type = FuzzyChoice(REUSE_TYPES.keys())
     topic = FuzzyChoice(REUSE_TOPICS.keys())
+    archived = None
 
     class Params:
         visible = factory.Trait(datasets=factory.LazyAttribute(lambda o: [DatasetFactory()]))

udata/core/reuse/forms.py

@@ -41,4 +41,5 @@ class ReuseForm(ModelForm):
     owner = fields.CurrentUserField()
     organization = fields.PublishAsField(_("Publish as"))
     deleted = fields.DateTimeField()
+    archived = fields.DateTimeField()
     extras = fields.ExtrasField()

udata/core/reuse/models.py

@@ -48,6 +48,7 @@ class Reuse(db.Datetimed, WithMetrics, BadgeMixin, Owned, db.Document):
 
     featured = db.BooleanField()
     deleted = db.DateTimeField()
+    archived = db.DateTimeField()
 
     def __str__(self):
         return self.title or ""

udata/core/reuse/search.py

@@ -34,6 +34,7 @@ class ReuseSearch(ModelSearchAdapter):
         "badge": Filter(),
         "featured": BoolFilter(),
         "topic": Filter(),
+        "archived": BoolFilter(),
     }
 
     @classmethod
@@ -78,6 +79,7 @@ class ReuseSearch(ModelSearchAdapter):
             "description": reuse.description,
             "url": reuse.url,
             "created_at": to_iso_datetime(reuse.created_at),
+            "archived": to_iso_datetime(reuse.archived) if reuse.archived else None,
             "views": reuse.metrics.get("views", 0),
             "followers": reuse.metrics.get("followers", 0),
             "datasets": reuse.metrics.get("datasets", 0),