fix

Author: matusdrobuliak66

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

@@ -14391,6 +14391,12 @@ components:
           - type: string
             const: ''
           title: Thumbnail
+        type:
+          $ref: '#/components/schemas/ProjectType'
+        templateType:
+          anyOf:
+          - $ref: '#/components/schemas/ProjectTemplateType'
+          - type: 'null'
         workbench:
           type: object
           title: Workbench
@@ -14482,6 +14488,8 @@ components:
       - name
       - description
       - thumbnail
+      - type
+      - templateType
       - workbench
       - prjOwner
       - accessRights
@@ -14581,6 +14589,12 @@ components:
           - type: string
             const: ''
           title: Thumbnail
+        type:
+          $ref: '#/components/schemas/ProjectType'
+        templateType:
+          anyOf:
+          - $ref: '#/components/schemas/ProjectTemplateType'
+          - type: 'null'
         workbench:
           type: object
           title: Workbench
@@ -14672,6 +14686,8 @@ components:
       - name
       - description
       - thumbnail
+      - type
+      - templateType
       - workbench
       - prjOwner
       - accessRights
@@ -14943,6 +14959,19 @@ components:
       - OPENED
       - MAINTAINING
       title: ProjectStatus
+    ProjectTemplateType:
+      type: string
+      enum:
+      - TEMPLATE
+      - TUTORIAL
+      - HYPERTOOL
+      title: ProjectTemplateType
+    ProjectType:
+      type: string
+      enum:
+      - TEMPLATE
+      - STANDARD
+      title: ProjectType
     ProjectTypeAPI:
       type: string
       enum:

services/web/server/tests/integration/01/test_garbage_collection.py

@@ -7,6 +7,7 @@
 import re
 from collections.abc import AsyncIterable, Awaitable, Callable
 from copy import deepcopy
+from enum import Enum
 from pathlib import Path
 from typing import Any, NamedTuple
 from unittest import mock
@@ -437,12 +438,16 @@ async def assert_user_not_in_db(
     assert user_db is None
 
 
+def enum_to_value(d):
+    return {k: (v.value if isinstance(v, Enum) else v) for k, v in d.items()}
+
+
 async def assert_project_in_db(
     aiopg_engine: aiopg.sa.Engine, user_project: dict
 ) -> None:
     project = await fetch_project_from_db(aiopg_engine, user_project)
     assert project
-    project_as_dict = dict(project)
+    project_as_dict = enum_to_value(dict(project))
 
     assert_dicts_match_by_common_keys(project_as_dict, user_project)