Update to include test-app for test driven development

Author: AIBappa

.devcontainer/devcontainer.json

@@ -12,7 +12,7 @@
         "source=${localWorkspaceFolder}/frontend,target=/app/frontend,type=bind"
     ],
     "forwardPorts": [
-        8000, 3000, 5432, 6379, 9092, 80, 9090, 3001, 8080, 8001
+        8000, 3000, 5432, 6379, 9092, 80, 9090, 3001, 8080, 8001, 8050
     ],
     "runServices": [
         "django",
@@ -25,7 +25,8 @@
         "prometheus",
         "osm-tile-server",
         "pgadmin",
-        "redisinsight"
+        "redisinsight",
+        "test-app"
     ],
     "customizations": {
         "vscode": {

.devcontainer/docker-compose.debug.yml

@@ -26,6 +26,26 @@ services:
     networks:
       - common_network
 
+  test-app: #To run this service, it needs to be noted in devcontainer.json
+    build:
+      context: ./.devcontainer/test-app
+      dockerfile: dockerfile.simulator
+    container_name: Dummydatacreate
+    volumes:
+      - ./.devcontainer/test-app:/test-app  # Maps the local directory to /app in the container
+    env_file:
+    - ./.env
+    environment:
+      #- DATABASE_URL=postgresql+psycopg2://postgres:true4@postgis:5432/gist4
+      DATABASE_URL: "postgresql+psycopg2://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}"
+    depends_on:
+      - postgres
+    ports:
+      - "8050:8050"  # Adjust according to your application needs
+    #command: ["sleep", "infinity"]  # Keeps the container running after building
+    networks:
+      - common_network
+
 networks:
   common_network:
     driver: bridge

.devcontainer/test-app/dockerfile.simulator

@@ -0,0 +1,27 @@
+# Use an official Python runtime as a parent image
+FROM python:3.11-slim-buster
+
+# Set environment variables
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
+
+# Set the working directory in the container
+WORKDIR /test-app
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    libpq-dev \
+    gdal-bin \
+    libgdal-dev \
+    postgresql-client \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Copy the requirements file and install Python dependencies
+COPY reqtest.txt .
+RUN pip install --no-cache-dir -r reqtest.txt
+
+# Do not specify CMD, as we'll run commands interactively during development
+# Default command to keep the container running
+CMD ["sleep", "infinity"]

.devcontainer/test-app/reqtest.txt

@@ -0,0 +1,19 @@
+certifi==2024.7.4
+et-xmlfile==1.1.0
+GeoAlchemy2==0.15.2
+geopandas==1.0.1
+greenlet==3.0.3
+numpy==2.0.1
+openpyxl==3.1.5
+packaging==24.1
+pandas==2.2.2
+psycopg2==2.9.9
+pyogrio==0.9.0
+pyproj==3.6.1
+python-dateutil==2.9.0.post0
+pytz==2024.1
+shapely==2.0.5
+six==1.16.0
+SQLAlchemy==2.0.32
+typing_extensions==4.12.2
+tzdata==2024.1

.gitignore

@@ -1,2 +1,5 @@
 .env
 *.bak
+*.xlsx
+*.xls
+

backend/core/core/settings.py

@@ -99,6 +99,7 @@
 
 # NAME,USER, PASSWORD, HOST and PORT are from environment variables defined in Django container in docker-compose.yml. If they do not work, default ones are given.
 # os.environ.get( environmental_varible, default value)
+# HOST specifies the IP address via actual IP notation or service notation (services get IP address allocated by docker compose)
 DATABASES = {
     'default': {
         'ENGINE': 'django.contrib.gis.db.backends.postgis',

backend/core/p1backend/models.py

@@ -50,6 +50,10 @@ class Contact(models.Model):
     address = models.CharField(max_length=100)
     gps_location = models.PointField()
     email = models.CharField(max_length=100)
+    
+    class Meta:
+        db_table = "cosellwkt"
+        managed = False
 
     def __str__(self):
         return self.name

docker-compose.yml

@@ -18,8 +18,8 @@ services:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - POSTGRES_HOST=postgres
-      - POSTGRES_PORT=5432
+      - POSTGRES_HOST=${POSTGRES_HOST}
+      - POSTGRES_PORT=${POSTGRES_PORT}
       - REDIS_HOST=redis
       - KAFKA_BROKER=kafka:9092
     networks: