MOD : pull request modifs

Author: bea777515

QA/py/pg_files/upgrade_prod.sql

@@ -2925,10 +2925,10 @@ ALTER TABLE projects ADD COLUMN access VARCHAR(1);
 -- PUBLIC ="1" when visible=True and no license
 UPDATE projects SET access='1' WHERE visible=true AND (license='' OR license IS NULL);
 -- OPEN="2" when visible=True and license = CC
-UPDATE projects SET access='2' WHERE visible=true AND license!='' AND LOWER(license) NOT LIKE 'copyright';
+UPDATE projects SET access='2' WHERE visible=true AND license!='' AND LOWER(license)!='copyright';
 
 -- private when copyright or visible=False
-UPDATE projects SET access='0' WHERE visible=false OR LOWER(license) LIKE 'copyright';
+UPDATE projects SET access='0' WHERE visible=false OR LOWER(license)='copyright';
 ALTER TABLE projects ALTER COLUMN access SET NOT NULL;
 ALTER TABLE projects ADD COLUMN formulae VARCHAR;
 

QA/py/tests/test_collections.py

@@ -119,7 +119,9 @@ def test_collection_lifecycle(database, fastapi, caplog, who):
     ] = """
     A bit less abstract...
     """
-    the_coll["short_title"] = "my-tiny-title"
+    # short_title only on second round
+    if who == CREATOR_AUTH:
+        the_coll["short_title"] = "my-tiny-title"
     the_coll["associate_organisations"] = ["An org"]
     the_coll["creator_organisations"] = ["At least one (ONE)"]
     rsp = fastapi.put(url, headers=who, json=the_coll)
@@ -136,6 +138,11 @@ def test_collection_lifecycle(database, fastapi, caplog, who):
     url = COLLECTION_SEARCH_URL.format(title="%coll%")
     rsp = fastapi.get(url, headers=who)
     assert rsp.status_code == status.HTTP_200_OK
+    if who == CREATOR_AUTH:
+        short_title = "my-tiny-title"
+    else:
+        short_title = None
+
     assert rsp.json() == [
         {
             "abstract": """
@@ -155,7 +162,7 @@ def test_collection_lifecycle(database, fastapi, caplog, who):
             "project_ids": [prj_id],
             "provider_user": None,
             "title": "Test collection",
-            "short_title": "my-tiny-title",
+            "short_title": short_title,
         }
     ]
 
@@ -169,10 +176,11 @@ def test_collection_lifecycle(database, fastapi, caplog, who):
     the_coll = {"project_ids": [prj_id]}
     rsp = fastapi.patch(url, headers=who, json=the_coll)
     assert rsp.status_code == status.HTTP_200_OK
-    # Search by short title
-    url = COLLECTION_EXACT_QUERY_URL.format(short_title="my-tiny-title")
-    rsp = fastapi.get(url, headers=who)
-    assert rsp.status_code == status.HTTP_200_OK
+    if who == CREATOR_AUTH:
+        # Search by short title
+        url = COLLECTION_EXACT_QUERY_URL.format(short_title="my-tiny-title")
+        rsp = fastapi.get(url, headers=who)
+        assert rsp.status_code == status.HTTP_200_OK
 
     # Wrong search by short title
     url = COLLECTION_EXACT_QUERY_URL.format(short_title="my-absent-title")
@@ -188,12 +196,15 @@ def test_collection_lifecycle(database, fastapi, caplog, who):
     # Delete the collection
     url = COLLECTION_DELETE_URL.format(collection_id=coll_id)
     rsp = fastapi.delete(url, headers=who)
-    assert rsp.status_code == status.HTTP_200_OK
-
-    # Ensure it's gone
-    url = COLLECTION_QUERY_URL.format(collection_id=coll_id)
-    rsp = fastapi.get(url, headers=who)
-    assert rsp.status_code == status.HTTP_404_NOT_FOUND
+    if who == CREATOR_AUTH:
+        # collection is published cannot delete
+        assert rsp.status_code == 409
+    else:
+        assert rsp.status_code == status.HTTP_200_OK
+        # Ensure it's gone
+        url = COLLECTION_QUERY_URL.format(collection_id=coll_id)
+        rsp = fastapi.get(url, headers=who)
+        assert rsp.status_code == status.HTTP_404_NOT_FOUND
 
 
 def regrant_if_needed(fastapi, prj_id, who):

QA/py/tests/test_update_prj.py

@@ -182,8 +182,8 @@ def test_update_prj(database, fastapi, caplog):
         "title": "Test Project Updates",
         "viewers": [],
         "visible": True,
-        "access":AccessLevelEnum.PUBLIC.value,
-        "formulae":None
+        "access": AccessLevelEnum.PUBLIC.value,
+        "formulae": None,
     }
 
     read_json = rsp.json()
@@ -208,7 +208,7 @@ def test_update_prj(database, fastapi, caplog):
     rsp = fastapi.get(url, headers=ADMIN_AUTH)
     assert rsp.json() != ref_json
     assert rsp.json()["comments"] == "New comment"
-    assert rsp.json()["access"]==AccessLevelEnum.PRIVATE.value
+    assert rsp.json()["access"] == AccessLevelEnum.PRIVATE.value
 
     # For ecotaxa/ecotaxa_dev#602
     # Set no contact at all

QA/py/tests/test_v_guest.py

@@ -3,17 +3,11 @@
 
 from tests.credentials import ADMIN_AUTH, USER_AUTH, ORDINARY_GUEST_GUEST_ID
 
-
-# noinspection PyPackageRequirements
-
-
 GUEST_UPDATE_URL = "/guests/{guest_id}"
-
 GUEST_CREATE_URL = "/guests/create"
-
 GUEST_GET_URL = "/guests"
 
-#WARNING must run after all test_user
+#WARNING must run after all test_user keep the test_v_guest.py name
 def test_guest_create(fastapi, caplog):
     caplog.set_level(logging.FATAL)
 

QA/py/tools/dbBuildSQL.py

@@ -1,6 +1,7 @@
 """
 Build the DB from scratch in EcoTaxa.
 """
+
 import os
 import shutil
 import socket
@@ -20,7 +21,6 @@
 if PG_HOST and PG_PORT:
     PG_PORT = int(PG_PORT)
 else:
-    # pg_lib = "/usr/lib/postgresql/135/bin/"  # ============ 124 passed, 1 skipped, 4 warnings in 223.88s (0:03:43) ============
     pg_lib = "/usr/lib/postgresql/14/bin/"  # ============ 124 passed, 1 skipped, 4 warnings in 221.91s (0:03:41) ============
     pgctl_bin = join(pg_lib, "pg_ctl")
     initdb_bin = join(pg_lib, "initdb")