♻️ licensed_resources ordering based on priority (🗃️) (ITISFoundation#7241)

on behalf of matus

Author: matusdrobuliak66

packages/models-library/src/models_library/api_schemas_webserver/licensed_items.py

@@ -141,17 +141,13 @@ def from_domain_model(cls, item: LicensedItem) -> Self:
                     exclude_unset=True,
                 ),
                 "licensed_resources": [
-                    _ItisVipResourceRestData(**x)
-                    for x in sorted(
-                        item.licensed_resources,
-                        key=lambda x: datetime.strptime(
-                            x["source"]["features"]["date"], "%Y-%m-%d"
-                        ),
-                        reverse=True,
-                    )
+                    _ItisVipResourceRestData(**x) for x in item.licensed_resources
                 ],
                 "category_id": item.licensed_resources[0]["category_id"],
                 "category_display": item.licensed_resources[0]["category_display"],
+                "terms_of_use_url": item.licensed_resources[0].get(
+                    "terms_of_use_url", None
+                ),
             }
         )
 

packages/models-library/src/models_library/licenses.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import date, datetime
 from enum import auto
 from typing import Annotated, Any, NamedTuple, NewType, NotRequired, TypeAlias, cast
 from uuid import UUID
@@ -47,7 +47,7 @@ class FeaturesDict(TypedDict):
     age: NotRequired[str]
     weight: NotRequired[str]
     height: NotRequired[str]
-    date: str
+    date: date
     ethnicity: NotRequired[str]
     functionality: NotRequired[str]
 
@@ -102,6 +102,7 @@ class LicensedResourceDB(BaseModel):
     licensed_resource_name: str
     licensed_resource_type: LicensedResourceType
     licensed_resource_data: dict[str, Any] | None
+    priority: int
 
     # states
     created: datetime

packages/postgres-database/src/simcore_postgres_database/migration/versions/5e43b5ec7604_licensed_resources_add_priority_column.py

@@ -0,0 +1,30 @@
+"""licensed_resources add priority column
+
+Revision ID: 5e43b5ec7604
+Revises: e8ffc0c96336
+Create Date: 2025-02-18 12:24:49.105989+00:00
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "5e43b5ec7604"
+down_revision = "e8ffc0c96336"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "licensed_resources",
+        sa.Column("priority", sa.SmallInteger(), server_default="0", nullable=False),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("licensed_resources", "priority")
+    # ### end Alembic commands ###

packages/postgres-database/src/simcore_postgres_database/models/licensed_resources.py

@@ -47,6 +47,13 @@
         nullable=True,
         doc="Resource metadata. Used for read-only purposes",
     ),
+    sa.Column(
+        "priority",
+        sa.SmallInteger,
+        nullable=False,
+        server_default="0",
+        doc="Used for sorting 0 (first) > 1 (second) > 2 (third) (ex. if we want to manually adjust how it is presented in the Market)",
+    ),
     column_created_datetime(timezone=True),
     column_modified_datetime(timezone=True),
     column_trashed_datetime("licensed_resources"),

packages/pytest-simcore/src/pytest_simcore/helpers/faker_factories.py

@@ -488,7 +488,7 @@ def random_itis_vip_available_download_item(
         f"name: {fake.name()} Right Hand,"  # w/o spaces
         f" version: V{fake.pyint()}.0,   "  # w/ x2 spaces
         f"sex: Male, age: 8 years,"  # w/o spaces
-        f"date: {fake.date()}, "  # w/ x1 spaces
+        f"date:  {fake.date()} , "  # w/ x2 spaces prefix, x1 space suffix
         f"ethnicity: Caucasian, functionality: {features_functionality}  "
         "}"
     )