continuation of last commit

Author: lcirvin

csvimport/zip_geocode.py

@@ -32,5 +32,8 @@ def importCsv(self):
         "AdminCode2":np.str,"AdminName3":np.str,"AdminCode3":np.str,"Latitude":np.str,"Longitude":np.str,"Accuracy":np.str})
 
         df['Accuracy'] = df['Accuracy'].replace('', '-1') 
-
-        self.storage.execute_batch_zipgeodata_insert(df)
+        importframe = pd.DataFrame()
+        importframe['PostalCode'] = df['PostalCode']
+        importframe['Latitude'] = df['Latitude']
+        importframe['Longitude'] = df['Longitude']
+        self.storage.execute_batch_zipgeodata_insert(importframe)

install.py

@@ -23,4 +23,4 @@ def setup_logger(log_level=logging.DEBUG):
     zipImport = ZipGeocodeImporter()
     zipImport.importCsv()
     storage.setup_postalcode_geometry()
-	
+

main.py

@@ -1,21 +1,18 @@
-from typing import Optional
 
 from neighbor.service import NeighborService
 
-from fastapi import FastAPI, File
-from pydantic import BaseModel, Field
+from fastapi import FastAPI
+
 
-import logging
-from decimal import Decimal
 app = FastAPI()
 
 service = NeighborService()
 service.storage.connect()
 
 @app.get("/nearest/{count}/{sourceType}/to/{postalCode}")
 async def nearest(count: int, sourceType: str, postalCode: str):
-    return service.getNearestNeighbor(count, sourceType, postalCode)
+    return service.getNearestNeighbor(count, sourceType, postalCode, 1000)
 
 @app.get("/nearest/{count}/{sourceType}/to/{postalCode}/within/{miles}")
 async def nearestWithin(count: int, sourceType: str, postalCode: str, miles:int):
-    return service.getNearestNeighborWithin(count, sourceType, postalCode, miles)
+    return service.getNearestNeighbor(count, sourceType, postalCode, miles)

neighbor/service.py

@@ -1,7 +1,7 @@
 from os import getenv
 from dotenv import load_dotenv
 load_dotenv()
-
+import json
 import io
 import logging
 log = logging.getLogger()
@@ -27,13 +27,11 @@ def __exit__(self, exception, exception_value, tb):
 
         self.storage.disconnect()
 
-
-    def getNearestNeighbor(self, count: int, sourceType: str, postalCode: str):
+    def getNearestNeighbor(self, count: int, sourceType: str, postalCode: str, miles: int):
         log.info(f"Getting {count} nearest {sourceType} to postal code {postalCode}")
-        return self.storage.get_neighbors_by_zip(count, sourceType, postalCode)
-
-    def getNearestNeighborWithin(self, count: int, sourceType: str, postalCode: str, miles: int):
-        log.info(f"Getting {count} nearest {sourceType} to postal code {postalCode}")
-        return self.storage.get_neighbors_by_zip(count, sourceType, postalCode, miles)
-
+        neighbors = self.storage.get_neighbors_by_zip(count, sourceType, postalCode, miles)
+        for neighbor in neighbors:
+            neighbor.update(json.loads(neighbor["rowdata"]))
+            neighbor.pop("rowdata")
 
+        return neighbors