[MDS-5811] gis_export_view migration (#3033)

* added migration for gis materialized view and updated model * update drop matview query * created sql-prod migration folder and set it to only run in prod environment
bcgov · Apr 4, 2024 · bdcf950 · bdcf950
1 parent 7604956
commit bdcf950
Show file tree

Hide file tree

Showing 8 changed files with 469 additions and 1 deletion.
diff --git a/docker-compose.M1.yaml b/docker-compose.M1.yaml
@@ -92,6 +92,7 @@ services:
       - PLATFORM=LOCAL
     volumes:
       - ./migrations/sql:/flyway/sql
+      - ./migrations/sql-prod:/flyway/sql-prod
       - ./migrations/scripts:/flyway/scripts
     depends_on:
       - postgres

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -92,6 +92,7 @@ services:
       - PLATFORM=LOCAL
     volumes:
       - ./migrations/sql:/flyway/sql
+      - ./migrations/sql-prod:/flyway/sql-prod
       - ./migrations/scripts:/flyway/scripts
     depends_on:
       - postgres

diff --git a/migrations/Dockerfile.flyway.M1.dev b/migrations/Dockerfile.flyway.M1.dev
@@ -7,6 +7,7 @@ USER root
 RUN apt-get update && apt-get install -y gettext
 
 COPY sql/* /flyway/sql/
+COPY sql-prod/* /flyway/sql-prod/
 COPY scripts/* /flyway/scripts/
 
 ENTRYPOINT /flyway/scripts/run_migrations.sh
diff --git a/migrations/Dockerfile.flyway.ci b/migrations/Dockerfile.flyway.ci
@@ -6,13 +6,15 @@ USER 0
 RUN apk add gettext
 
 COPY sql/* /flyway/sql/
+COPY sql-prod/* /flyway/sql-prod/
 COPY scripts/* /flyway/scripts/
 
 
 ENV FLYWAY_VERSION=5.2.4
 
 # Copy over the SQL files and scripts
 COPY sql/* $FLYWAY_HOME/sql/
+COPY sql-prod/* $FLYWAY_HOME/sql-prod/
 COPY scripts/* $FLYWAY_HOME/scripts/
 
 RUN chmod -R 777 $FLYWAY_HOME

diff --git a/migrations/Dockerfile.flyway.dev b/migrations/Dockerfile.flyway.dev
@@ -5,6 +5,7 @@ USER root
 RUN apk add gettext
 
 COPY sql/* /flyway/sql/
+COPY sql-prod/* /flyway/sql-prod/
 COPY scripts/* /flyway/scripts/
 
 ENTRYPOINT /flyway/scripts/run_migrations.sh
diff --git a/migrations/scripts/run_migrations.sh b/migrations/scripts/run_migrations.sh
@@ -16,8 +16,16 @@ fi
 # Make flyway binary discoverable
 export PATH="$FLYWAY_HOME:$PATH"
 
+ENVIRONMENT_NAME="${ENVIRONMENT_NAME:-dev}"
+
 # Run migrations for mds database
-flyway -validateMigrationNaming=true migrate
+if [[ $ENVIRONMENT_NAME == 'prod' ]]; then
+    echo "---> Running prod migrations"
+    flyway -locations=filesystem:sql,filesystem:sql-prod -validateMigrationNaming=true migrate
+else
+    echo "---> Running common migrations"
+    flyway -locations=filesystem:sql -validateMigrationNaming=true migrate
+fi
 
 # Run migrations for mds_test database
 if [ "$PLATFORM" != "K8S" ]; then

diff --git a/migrations/sql-prod/R__now_gis_export_materialized_view.sql b/migrations/sql-prod/R__now_gis_export_materialized_view.sql
diff --git a/services/core-api/app/api/exports/now_application/models/now_application_gis_export.py b/services/core-api/app/api/exports/now_application/models/now_application_gis_export.py
@@ -23,6 +23,9 @@ class NowApplicationGisExport(Base):
     now_latitude = db.Column(db.String)
     now_longitude = db.Column(db.String)
     verified_date = db.Column(db.String)
+    mine_purpose = db.Column(db.String)
+    latest_response_date = db.Column(db.String)
+    regional_contact = db.Column(db.String)
 
     # Notice of Work Details
     is_applicant_individual_or_company = db.Column(db.String)