Added numericise_ignore in spreadsheet.py file

Pa04rth · northdpole · commit 361c574da2e1 · 2025-03-30T19:04:16.000+01:00
diff --git a/application/database/db.py b/application/database/db.py
@@ -679,16 +679,6 @@ def __init__(self) -> None:
             self.neo_db = NEO_DB.instance()
         self.session = sqla.session
 
-    def get_resources(self):
-        # Query to fetch distinct resource names from the Node table
-        resources = (
-            self.session.query(Node.name)
-            .filter(Node.ntype == cre_defs.Credoctypes.Standard.value)
-            .distinct()
-            .all()
-        )
-        return [resource[0] for resource in resources]
-
     def with_graph(self) -> "Node_collection":
         logger.info("Loading CRE graph in memory, memory-heavy operation!")
         self.graph = inmemory_graph.CRE_Graph()
diff --git a/application/tests/spreadsheet_test.py b/application/tests/spreadsheet_test.py
@@ -107,3 +107,20 @@ def test_prepare_spreadsheet(self) -> None:
         result = list(csv.DictReader(out))
 
         self.assertCountEqual(result, expected)
+
+    # def get_spreadsheet_url(self) -> str:
+    #     """Helper function to retrieve the spreadsheet URL from an environment variable."""
+    #     return os.environ.get("TEST_SPREADSHEET_URL", "https://docs.google.com/spreadsheets/d/1IgfpPw5TCKSJ4eDlzfI9oNwVOZgtXQvWxSbC7SHE7Zg")
+
+    # def test_read_spreadsheet_iso_numbers(self) -> None:
+    #     url = self.get_spreadsheet_url()
+    #     alias = "Test Spreadsheet"
+    #     result = read_spreadsheet(url, alias, validate=False, parse_numbered_only=False)
+        
+    #     # Assuming the spreadsheet has a column "ISO Number" with values "7.10" and "8.20"
+    #     expected = [
+    #         {"ISO Number": "7.10", "Name": "Example 1", "Value": 10},
+    #         {"ISO Number": "8.20", "Name": "Example 2", "Value": 20}
+    #     ]
+        
+    #     self.assertEqual(result["Sheet1"], expected)
diff --git a/application/utils/spreadsheet.py b/application/utils/spreadsheet.py
@@ -59,13 +59,13 @@ def read_spreadsheet(
                     " will be processed by convention)" % wsh.title
                 )
                 records = wsh.get_all_records(
-                    wsh.row_values(1)
+                    head=1, numericise_ignore=["ISO Number"]  # Added numericise_ignore parameter
                 )  # workaround because of https://github.com/burnash/gspread/issues/1007 # this will break if the column names are in any other line
                 toyaml = yaml.safe_load(yaml.safe_dump(records))
                 result[wsh.title] = toyaml
             elif not parse_numbered_only:
                 records = wsh.get_all_records(
-                    wsh.row_values(1)
+                    head=1, numericise_ignore=["ISO Number"]  # Added numericise_ignore parameter
                 )  # workaround because of https://github.com/burnash/gspread/issues/1007 # this will break if the column names are in any other line
                 toyaml = yaml.safe_load(yaml.safe_dump(records))
                 result[wsh.title] = toyaml
@@ -81,7 +81,6 @@ def read_spreadsheet(
 
     return result
 
-
 class ExportSheet:
     processed_ids = []
     body = []
diff --git a/application/web/web_main.py b/application/web/web_main.py
@@ -253,16 +253,6 @@ def find_document_by_tag() -> Any:
     abort(404, "Tag does not exist")
 
 
-#  , to ensure that ISO numbers are treated as strings when fetched from the database and returned in API responses ,
-@app.route("/api/resources", methods=["GET"])
-def get_resources():
-    database = db.Node_collection()
-    resources = database.get_resources()  # Fetch resources from the database
-    iso_numbers = ["7.1", "7.10", "8.1", "8.10"]
-    resources.extend(iso_numbers)
-    return jsonify(resources)
-
-
 @app.route("/rest/v1/map_analysis", methods=["GET"])
 def map_analysis() -> Any:
     standards = request.args.getlist("standard")
