DBC22-5170: fixed the highway name underscore issue and added sql server driver installation back in the backend docker file (#1096)

* DBC22-5170: avoid to update highway name in huey task

* DBC22-5170: add sql server driver back and fixed highway name underscore issue

* DBC22-5170: add sql server driver back and fixed highway name underscore issue

* DBC22-5170: add sql server driver back and fixed highway name underscore issue

Author: bcgov-brwang

compose/backend/Dockerfile

@@ -13,6 +13,18 @@ RUN apt-get update \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*
 
+  # Install dependencies for SQL database connection
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends curl gnupg2 apt-transport-https && \
+    curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /usr/share/keyrings/microsoft-prod.gpg && \
+    echo "deb [arch=amd64 signed-by=/usr/share/keyrings/microsoft-prod.gpg] https://packages.microsoft.com/debian/12/prod bookworm main" > /etc/apt/sources.list.d/mssql-release.list && \
+    apt-get update && \
+    ACCEPT_EULA=Y apt-get install -y --no-install-recommends msodbcsql17 unixodbc-dev gcc g++ && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+
+
 # Adding backend directory to make absolute filepaths consistent across services
 WORKDIR /app/backend
 

src/backend/apps/consumer/processor.py

@@ -36,7 +36,7 @@
 # PVC path to watermarked images with timestamp for ReplayTheDay
 PVC_WATERMARKED_PATH = os.getenv("PVC_WATERMARKED_PATH")
 # PVC path to watermarked images for current DriveBC without timestamp
-DRIVCBC_PVC_WATERMARKED_PATH = os.getenv("DRIVCBC_PVC_WATERMARKED_PATH")
+DRIVEBC_PVC_WATERMARKED_PATH = os.getenv("DRIVEBC_PVC_WATERMARKED_PATH")
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
@@ -320,9 +320,9 @@ def save_watermarked_image_to_pvc(camera_id: str, image_bytes: bytes, timestamp:
         logger.error(f"Error saving Watermarked image to PVC {filepath}: {e}")
 
 def save_watermarked_image_to_drivebc_pvc(camera_id: str, image_bytes: bytes):  
-    os.makedirs(os.path.dirname(f'{DRIVCBC_PVC_WATERMARKED_PATH}'), exist_ok=True)
+    os.makedirs(os.path.dirname(f'{DRIVEBC_PVC_WATERMARKED_PATH}'), exist_ok=True)
 
-    save_dir = os.path.join(DRIVCBC_PVC_WATERMARKED_PATH)
+    save_dir = os.path.join(DRIVEBC_PVC_WATERMARKED_PATH)
     os.makedirs(save_dir, exist_ok=True)
     filename = f"{camera_id}.jpg"
     filepath = os.path.join(save_dir, filename)

src/backend/apps/webcam/tasks.py

@@ -155,12 +155,14 @@ def update_webcam_db(cam_id: int, cam_data: dict):
     time_now_utc = datetime.datetime.now(timezone.utc).strftime("%Y%m%d%H%M%S%f")[:-3]
     camera_status = calculate_camera_status(time_now_utc)
 
+    
+    raw_highway = cam_data.get("highway", "")
     updated_count = Webcam.objects.filter(id=cam_id).update(
         region_name=cam_data.get("region_name"),
         is_on=True if cam_data.get("isOn") == 1 else False,
         name=cam_data.get("cam_internetname"),
         caption=cam_data.get("cam_internetcaption", ""),
-        highway=cam_data.get("highway", ""),
+        highway=raw_highway.split("_", 1)[1] if "_" in raw_highway else int(raw_highway),
         highway_description=cam_data.get("highway_description", ""),
         orientation=cam_data.get("orientation", ""),
         elevation=cam_data.get("elevation", 0),