Update ANAS to AzScienceNet and PIONIER to PSNC

compendium_v2/conversion/conversion.py

@@ -122,7 +122,7 @@ def load_service_data():
     for i in range(0, 131):
         if titles[i].value:
             name = titles[i].value.split(' ')[0].upper()
-            name = {'KIFÜ': 'KIFU', 'AZSCIENCENET': 'ANAS', 'PSNC': 'PIONIER'}.get(name, name)
+            name = {'KIFÜ': 'KIFU', 'ANAS': 'AZSCIENCENET', 'PIONIER': 'PSNC'}.get(name, name)
             nren_service_data_columns[name] = i
 
     nren_service_data = {}

compendium_v2/conversion/mapping.py

@@ -32,7 +32,7 @@ WHERE nren_id = {}
 """
 
 NREN_IDS = {
-    "ANAS": 49,
+    "AzScienceNet": 49,
     "GRNET": 17,
     "Restena": 28,
     "University of Malta": 29,
@@ -62,7 +62,7 @@ NREN_IDS = {
     "LITNET": 27,
     "MARnet": 14,
     "MREN": 100,
-    "PIONIER": 34,
+    "PSNC": 34,
     "RASH": 1,
     "RedIRIS": 40,
     "RENAM": 30,

compendium_v2/migrations/versions/049353edaa79_add_nren_country.py

@@ -68,7 +68,7 @@ def upgrade():
         'LITNET': 'Lithuania',
         'MARnet': 'North Macedonia',
         'MREN': 'Montenegro',
-        'PIONIER': 'Poland',
+        'PSNC': 'Poland',
         'RASH': 'Albania',
         'RedIRIS': 'Spain',
         'RENAM': 'Moldova',

compendium_v2/migrations/versions/1a00d446dff7_update_nren_names.py

+"""update nren names
+
+Revision ID: 1a00d446dff7
+Revises: c7179d69907c
+Create Date: 2023-12-07 13:57:05.035581
+
+"""
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = '1a00d446dff7'
+down_revision = 'c7179d69907c'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.execute("UPDATE nren SET name='AzScienceNet' WHERE name='ANAS'")
+    op.execute("UPDATE nren SET name='PSNC' WHERE name='PIONIER'")
+
+
+def downgrade():
+    op.execute("UPDATE nren SET name='ANAS' WHERE name='ANAS'")
+    op.execute("UPDATE nren SET name='PIONIER' WHERE name='PSNC'")

compendium_v2/migrations/versions/2b698bb45c09_normalize_nrens.py

@@ -57,7 +57,7 @@ def upgrade():
         "('LITNET'),"
         "('MARnet'),"
         "('MREN'),"
-        "('PIONIER'),"
+        "('PSNC'),"
         "('RASH'),"
         "('RedIRIS'),"
         "('RENAM'),"

compendium_v2/migrations/versions/42a826af0431_update_a_few_nren_names.py

@@ -16,7 +16,7 @@ depends_on = None
 
 
 def upgrade():
-    op.execute("UPDATE nren SET name='ANAS' WHERE name='AzScienceNet'")
+    op.execute("UPDATE nren SET name='AzScienceNet' WHERE name='ANAS'")
     op.execute("UPDATE nren SET name='GRNET' WHERE name='GRNET S.A.'")
     op.execute("UPDATE nren SET name='Restena' WHERE name='RESTENA'")
     op.execute("UPDATE nren SET name='University of Malta' WHERE name='UoM'")

compendium_v2/publishers/excel_parser.py

@@ -410,7 +410,7 @@ def fetch_nren_services_excel_data():
 
     def normalize_nren_name(n: str) -> str:
         n = n.split(' ')[0].upper()
-        return {'KIFÜ': 'KIFU', 'AZSCIENCENET': 'ANAS', 'PSNC': 'PIONIER'}.get(n, n)
+        return {'KIFÜ': 'KIFU', 'ANAS': 'AZSCIENCENET', 'PIONIER': 'PSNC'}.get(n, n)
 
     for i in range(0, 131):
         if titles[i].value:

compendium_v2/publishers/helpers.py

@@ -30,10 +30,11 @@ def get_uppercase_nren_dict():
     nren_dict['UNINETT'] = nren_dict['SIKT']
     nren_dict['LANET'] = nren_dict['LAT']
     nren_dict['ANA'] = nren_dict['RASH']
-    nren_dict['AZSCIENCENET'] = nren_dict['ANAS']
+    nren_dict['ANAS'] = nren_dict['AZSCIENCENET']
     nren_dict['GRNET S.A.'] = nren_dict['GRNET']
     nren_dict['FUNET'] = nren_dict['CSC']
-    nren_dict['PIONEER'] = nren_dict['PIONIER']
+    nren_dict['PIONIER'] = nren_dict['PSNC']
+    nren_dict['PIONEER'] = nren_dict['PSNC']
     return nren_dict
 
 

test/test_survey_publisher_legacy_excel.py

@@ -13,8 +13,8 @@ def test_excel_publisher(app_with_survey_db, mocker):
     mocker.patch('compendium_v2.publishers.excel_parser.EXCEL_FILE_ORGANISATION', EXCEL_FILE)
 
     with app_with_survey_db.app_context():
-        nren_names = ['SURF', 'KIFU', 'University of Malta', 'ASNET-AM', 'SIKT', 'LAT', 'RASH', 'ANAS', 'GRNET', 'CSC',
-                      'PIONIER']
+        nren_names = ['SURF', 'KIFU', 'University of Malta', 'ASNET-AM', 'SIKT', 'LAT', 'RASH', 'AzScienceNet', 'GRNET',
+                      'CSC', 'PSNC']
         db.session.add_all([presentation_models.NREN(name=nren_name, country='country') for nren_name in nren_names])
         db.session.commit()
 

test/test_survey_publisher_old_db_2022.py

@@ -210,7 +210,7 @@ def test_publisher(app_with_survey_db, mocker):
     mocker.patch('compendium_v2.publishers.survey_publisher_old_db_2022.recursive_query', institutions_urls_data)
 
     nren_names = ['Nren1', 'Nren2', 'Nren3', 'Nren4', 'SURF', 'KIFU', 'University of Malta', 'ASNET-AM',
-                  'SIKT', 'LAT', 'RASH', 'ANAS', 'GRNET', 'CSC', 'PIONIER']
+                  'SIKT', 'LAT', 'RASH', 'AzScienceNet', 'GRNET', 'CSC', 'PSNC']
     with app_with_survey_db.app_context():
         db.session.add_all([presentation_models.NREN(name=nren_name, country='country') for nren_name in nren_names])
         db.session.commit()