From 7012ca1c2822ff06c5cfbcdab4ed55749df39332 Mon Sep 17 00:00:00 2001
From: Hamza-Ayed <hamzaayedflutter@gmail.com>
Date: Mon, 6 Apr 2026 01:30:12 +0300
Subject: [PATCH] feat: add syria data import scripts and update geocoding
 search to include neighbourhood

---
 apps/api/src/geocoding/geocoding.service.ts |  6 +--
 import_syria_csv.sh                         | 55 +++++++++++++++++++++
 2 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 import_syria_csv.sh

diff --git a/apps/api/src/geocoding/geocoding.service.ts b/apps/api/src/geocoding/geocoding.service.ts
index 7bce6b5..0beb044 100644
--- a/apps/api/src/geocoding/geocoding.service.ts
+++ b/apps/api/src/geocoding/geocoding.service.ts
@@ -67,11 +67,11 @@ export class GeocodingService {
       for (const tableName of userTables) {
         let repo: Repository<any> = tableName === 'places_egypt' ? this.placesEgyptRepository : (tableName === 'places_jordan' ? this.placesJordanRepository : this.placesSyriaRepository);
         const userQuery = `
-          SELECT id, name, name_ar, name_en, category, latitude, longitude, address, '${tableName.replace('places_', '')}' as region, 'user_submitted' as source,
+          SELECT id, name, name_ar, name_en, category, neighbourhood, latitude, longitude, address, '${tableName.replace('places_', '')}' as region, 'user_submitted' as source,
           CASE WHEN $2::float IS NOT NULL THEN ST_DistanceSphere(location, ST_SetSRID(ST_MakePoint($3::float, $2::float), 4326)) ELSE 0 END as distance,
-          similarity(COALESCE(name_ar, ''), $1) + similarity(COALESCE(name, ''), $1) as relevance
+          similarity(COALESCE(name_ar, ''), $1) + similarity(COALESCE(name, ''), $1) + similarity(COALESCE(neighbourhood, ''), $1) as relevance
           FROM ${tableName}
-          WHERE (name_ar % $1 OR name % $1 OR name_ar ILIKE $4 OR name ILIKE $4)
+          WHERE (name_ar % $1 OR name % $1 OR neighbourhood % $1 OR name_ar ILIKE $4 OR name ILIKE $4 OR neighbourhood ILIKE $4)
           ${hasLocation ? `AND (location && ST_Expand(ST_SetSRID(ST_MakePoint($3::float, $2::float), 4326), $5::float) OR ST_DistanceSphere(location, ST_SetSRID(ST_MakePoint($3::float, $2::float), 4326)) <= $6::float)` : ''}
           ORDER BY relevance DESC, distance ASC LIMIT 15
         `;
diff --git a/import_syria_csv.sh b/import_syria_csv.sh
new file mode 100644
index 0000000..c88c7f5
--- /dev/null
+++ b/import_syria_csv.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+set -e
+
+# Configuration
+CONTAINER_NAME="map-db"
+DB_USER="postgres"
+DB_NAME="map_saas"
+CSV_FILE="infrastructure/docker/postgis/data_clean_syria.csv"
+SQL_SCHEMA="infrastructure/docker/postgis/create_syria_table.sql"
+
+# 1. Ensure the table exists
+echo "Setting up Syria table..."
+docker exec -i $CONTAINER_NAME psql -U $DB_USER -d $DB_NAME < $SQL_SCHEMA
+
+# 2. Upload CSV to container for fast bulk loading
+echo "Copying CSV to database container..."
+docker cp $CSV_FILE $CONTAINER_NAME:/tmp/data_clean_syria.csv
+
+# 3. Import data using a temporary table to map columns correctly
+echo "Importing data into PostGIS..."
+docker exec -i $CONTAINER_NAME psql -U $DB_USER -d $DB_NAME <<EOF
+-- Create temporary table for CSV import
+CREATE TEMP TABLE temp_syria_import (
+    search_query TEXT,
+    name TEXT,
+    rating TEXT,
+    reviews TEXT,
+    latitude DECIMAL,
+    longitude DECIMAL,
+    maps_url TEXT,
+    scraped_at TEXT
+);
+
+-- Copy from CSV (header row exists)
+COPY temp_syria_import FROM '/tmp/data_clean_syria.csv' WITH (FORMAT csv, HEADER true, ENCODING 'UTF8');
+
+-- Insert into main table
+-- Mapping search_query -> neighbourhood
+INSERT INTO places_syria (name, neighbourhood, latitude, longitude, created_at)
+SELECT name, search_query, latitude, longitude, 
+       CASE WHEN scraped_at IS NOT NULL AND scraped_at <> '' THEN scraped_at::timestamp ELSE CURRENT_TIMESTAMP END
+FROM temp_syria_import;
+
+-- Update PostGIS geometry column
+UPDATE places_syria 
+SET location = ST_SetSRID(ST_MakePoint(longitude, latitude), 4326)
+WHERE location IS NULL AND latitude IS NOT NULL AND longitude IS NOT NULL;
+
+-- Clean up
+DROP TABLE temp_syria_import;
+EOF
+
+echo "✅ Import completed successfully!"
+echo "Data sample from places_syria:"
+docker exec -i $CONTAINER_NAME psql -U $DB_USER -d $DB_NAME -c "SELECT name, neighbourhood, latitude, longitude FROM places_syria LIMIT 5;"