Merge pull request #233 from M3nin0/feature/harvester-schema

harvest: update harvester schema
geo-knowledge-hub · Nov 8, 2024 · d171b58 · d171b58
2 parents 523b3d7 + 1784778
commit d171b58
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 28 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-          python-version: [3.7, 3.8, 3.9]
+          python-version: [3.8, 3.9]
           requirements-level: [dev]  # current scenario for the GEO Knowledge Hub
           db-service: [postgresql13]
           search-service: [opensearch2]

diff --git a/geo_rdm_records/base/services/schemas/harvester.py b/geo_rdm_records/base/services/schemas/harvester.py
@@ -18,15 +18,13 @@ class HarvesterSoftwareSchema(Schema):
 
     version = SanitizedUnicode(required=True)
 
-    repository = fields.URL(required=True)
-
 
 class HarvesterOriginSchema(Schema):
     """Harvester origin schema."""
 
     name = SanitizedUnicode(required=True)
 
-    url = fields.URL(required=True)
+    id = SanitizedUnicode(required=True)
 
 
 class HarvesterSchema(Schema):

diff --git a/geo_rdm_records/modules/packages/records/jsonschemas/packages/geo-parent-v1.0.0.json b/geo_rdm_records/modules/packages/records/jsonschemas/packages/geo-parent-v1.0.0.json
@@ -121,9 +121,6 @@
             },
             "version": {
               "type": "string"
-            },
-            "repository": {
-              "type": "string"
             }
           }
         },
@@ -134,7 +131,7 @@
             "name": {
               "type": "string"
             },
-            "url": {
+            "id": {
               "type": "string"
             }
           }

diff --git a/...m_records/modules/packages/records/mappings/os-v2/geordmpackages/drafts/draft-v1.0.0.json b/...m_records/modules/packages/records/mappings/os-v2/geordmpackages/drafts/draft-v1.0.0.json
@@ -311,9 +311,6 @@
                   },
                   "version": {
                     "type": "text"
-                  },
-                  "repository": {
-                    "type": "text"
                   }
                 }
               },
@@ -323,7 +320,7 @@
                   "name": {
                     "type": "text"
                   },
-                  "url": {
+                  "id": {
                     "type": "text"
                   }
                 }

diff --git a/...records/modules/packages/records/mappings/os-v2/geordmpackages/records/record-v1.0.0.json b/...records/modules/packages/records/mappings/os-v2/geordmpackages/records/record-v1.0.0.json
@@ -267,9 +267,6 @@
                   },
                   "version": {
                     "type": "text"
-                  },
-                  "repository": {
-                    "type": "text"
                   }
                 }
               },
@@ -279,7 +276,7 @@
                   "name": {
                     "type": "text"
                   },
-                  "url": {
+                  "id": {
                     "type": "text"
                   }
                 }

diff --git a/geo_rdm_records/modules/rdm/records/jsonschemas/records/geo-parent-v1.0.0.json b/geo_rdm_records/modules/rdm/records/jsonschemas/records/geo-parent-v1.0.0.json
@@ -114,9 +114,6 @@
             },
             "version": {
               "type": "string"
-            },
-            "repository": {
-              "type": "string"
             }
           }
         },
@@ -127,7 +124,7 @@
             "name": {
               "type": "string"
             },
-            "url": {
+            "id": {
               "type": "string"
             }
           }

diff --git a/geo_rdm_records/modules/rdm/records/mappings/os-v2/geordmrecords/drafts/draft-v1.0.0.json b/geo_rdm_records/modules/rdm/records/mappings/os-v2/geordmrecords/drafts/draft-v1.0.0.json
@@ -264,9 +264,6 @@
                   },
                   "version": {
                     "type": "text"
-                  },
-                  "repository": {
-                    "type": "text"
                   }
                 }
               },
@@ -276,7 +273,7 @@
                   "name": {
                     "type": "text"
                   },
-                  "url": {
+                  "id": {
                     "type": "text"
                   }
                 }

diff --git a/geo_rdm_records/modules/rdm/records/mappings/os-v2/geordmrecords/records/record-v1.0.0.json b/geo_rdm_records/modules/rdm/records/mappings/os-v2/geordmrecords/records/record-v1.0.0.json
@@ -224,9 +224,6 @@
                   },
                   "version": {
                     "type": "text"
-                  },
-                  "repository": {
-                    "type": "text"
                   }
                 }
               },
@@ -236,7 +233,7 @@
                   "name": {
                     "type": "text"
                   },
-                  "url": {
+                  "id": {
                     "type": "text"
                   }
                 }