Adjusted environments and scripts to clean up onboarding

Orchestration/docker-compose-example.yml

@@ -1,28 +1,25 @@
 version: '3.1'
 
 services:
-#  backend:
-#    build:
-#      context: ../python
-#    image: 311-data-back:0.0.1
-#    restart: always
-#    container_name: "311-backend"
-#    environment:
-#      SODAPY_APPTOKEN: <Your Token Here>
-#    ports:
-#      - 5000:5000
-#
-#  frontend:
-#    build:
-#      context: ../javascript/react/311-data
-#    image: 311-data-front:0.0.1
-#    volumes:
-#      - '../javascript/react/311-data:/app'
-#      - '/app/node_modules'
-#    restart: always
-#    container_name: "311-frontend"
-#    ports:
-#      - 3000:3000
+  backend:
+   build:
+     context: ../server
+   image: 311-data-back:0.0.1
+   restart: always
+   container_name: "311-backend"
+   environment:
+     DB_CONNECTION_STRING: postgres://REDACTED:REDACTED@db:5432/postgres
+   ports:
+     - 5000:5000
+
+  frontend:
+   build:
+     context: ..
+   image: 311-data-front:0.0.1
+   restart: always
+   container_name: "311-frontend"
+   ports:
+     - 3000:3000
 
   db:
     image: postgres

onboard.sh

@@ -149,7 +149,7 @@ if [ -f ./server/src/static/2018_mini.csv ]; then
 else
   echo "🕺 Downloading the first 10000 rows of the 2018 dataset for seeding"
 
-  curl 'https://data.lacity.org/resource/h65r-yf5i.csv?$select=*&$limit=10000' -o server/src/static/2018_mini.csv
+  curl 'https://data.lacity.org/resource/h65r-yf5i.csv?$select=SRNumber,CreatedDate,UpdatedDate,ActionTaken,Owner,RequestType,Status,RequestSource,MobileOS,Anonymous,AssignTo,ServiceDate,ClosedDate,AddressVerified,ApproximateAddress,Address,HouseNumber,Direction,StreetName,Suffix,ZipCode,Latitude,Longitude,Location,TBMPage,TBMColumn,TBMRow,APC,CD,CDMember,NC,NCName,PolicePrecinct&$limit=10000' -o server/src/static/2018_mini.csv
 
   echo "Once the docker compose environment is setup you can send a POST request"
   echo 'To /ingest with body argument of {"sets":["2018_MINI"]} to seed the db'
@@ -160,7 +160,7 @@ fi
 while true; do
     read -p "Do you wish to run the docker environment? (postgres, frontend, backend, adminer)?" yn
     case $yn in
-        [Yy]* ) docker-compose -f ./Orchestration/docker-compose.yml up -d && exit;;
+        [Yy]* ) docker-compose -f ./Orchestration/docker-compose.yml up --build -d && exit;;
         [Nn]* ) exit;;
         * ) echo "Please answer yes or no.";;
     esac

server/src/app.py

@@ -18,6 +18,8 @@ def configure_app():
     settings_file = os.path.join(os.getcwd(),'settings.cfg')
     config.read(settings_file)
     app.config['Settings'] = config
+    if os.environ.get('DB_CONNECTION_STRING', None):
+        app.config['Settings']['Database']['DB_CONNECTION_STRING'] = os.environ.get('DB_CONNECTION_STRING')
     app.config["STATIC_DIR"] = os.path.join(os.getcwd(), "static")
     os.makedirs(os.path.join(app.config["STATIC_DIR"], "temp"), exist_ok=True)
 

server/src/services/sqlIngest.py

@@ -38,7 +38,7 @@ def loadData(self, fileName="2018_mini"):
         else:
             dataFile = fileName + ".tsv"
 
-        self.filePath  = os.path.join("../", self.config['Database']['DATA_DIRECTORY'], dataFile )
+        self.filePath  = os.path.join(self.config['Database']['DATA_DIRECTORY'], dataFile )
         print('Loading dataset %s' % self.filePath)
         self.data = pd.read_table(self.filePath,
                                     sep=self.separator,

server/src/settings.example.cfg

@@ -5,7 +5,7 @@ PORT = 5000
 
 [Database]
 DB_CONNECTION_STRING = postgres://REDACTED:REDACTED@localhost:5432/postgres
-DATA_DIRECTORY = .
+DATA_DIRECTORY = static
 
 [Api]
 REDACTED = REDACTED