Dev to Master

.example.env

@@ -1,3 +1,2 @@
 REACT_APP_MAPBOX_TOKEN=REDACTED
 DB_URL=REDACTED
-BASE_URL=/311-data

.github/workflows/Continuous_Delivery.yml

@@ -24,7 +24,6 @@ jobs:
       run: |
         echo REACT_APP_MAPBOX_TOKEN=${{ secrets.MAPBOX_TOKEN }} > .env
         echo DB_URL=${{ secrets.DB_URL }} >> .env
-        echo BASE_URL=${{ secrets.BASE_URL }} >> .env
         echo GITHUB_SHA=${{ github.sha }} >> .env
     - name: Build project
       run: npm run build
@@ -36,7 +35,6 @@ jobs:
         ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         REACT_APP_MAPBOX_TOKEN: ${{ secrets.MAPBOX_TOKEN }}
         DB_URL: ${{ secrets.DB_URL }}
-        BASE_URL: ${{ secrets.BASE_URL }}
         BASE_BRANCH: master # The branch the action should deploy from.
         BRANCH: gh-pages # The branch the action should deploy to.
         FOLDER: dist # The folder the action should deploy.

Orchestration/docker-compose-example.yml

@@ -26,7 +26,6 @@ services:
    environment:
      REACT_APP_MAPBOX_TOKEN: REDACTED
      DB_URL: http://localhost:5000
-     BASE_URL: ''
    ports:
      - 3000:3000
 

copyEnv.sh

@@ -1,5 +1,4 @@
 echo REACT_APP_MAPBOX_TOKEN=$REACT_APP_MAPBOX_TOKEN > .env
 echo DB_URL=$DB_URL >> .env
-echo BASE_URL=$BASE_URL >> .env
 webpack
 node server.js

server/src/app.py

@@ -8,19 +8,18 @@
 from datetime import datetime
 from multiprocessing import cpu_count
 
-from services.timeToCloseService import TimeToCloseService
-from services.frequencyService import FrequencyService
-from services.pinService import PinService
 from services.pinClusterService import PinClusterService
 from services.heatmapService import HeatmapService
-from services.requestCountsService import RequestCountsService
 from services.requestDetailService import RequestDetailService
+from services.visualizationsService import VisualizationsService
+from services.comparisonService import ComparisonService
 from services.sqlIngest import DataHandler
 from services.feedbackService import FeedbackService
 from services.dataService import DataService
 
 from utils.sanic import add_performance_header
 from utils.redis import cache
+from utils.database import db
 
 app = Sanic(__name__)
 CORS(app)
@@ -48,6 +47,7 @@ def configure_app():
     if app.config['Settings']['Server']['Debug']:
         add_performance_header(app)
     cache.config(app.config['Settings']['Redis'])
+    db.config(app.config['Settings']['Database'])
 
 
 @app.route('/apistatus')
@@ -61,7 +61,7 @@ async def healthcheck(request):
         settings['Version']['VER_MINOR'],
         settings['Version']['VER_PATCH'])
 
-    data_worker = DataService(settings)
+    data_worker = DataService()
     lastPulled = await data_worker.lastPulled()
 
     return json({'currentTime': currentTime,
@@ -76,82 +76,6 @@ async def index(request):
     return json('You hit the index')
 
 
-@app.route('/timetoclose', methods=["POST"])
-@compress.compress()
-async def timetoclose(request):
-    ttc_worker = TimeToCloseService(app.config['Settings'])
-
-    postArgs = request.json
-    start = postArgs.get('startDate', None)
-    end = postArgs.get('endDate', None)
-    ncs = postArgs.get('ncList', [])
-    requests = postArgs.get('requestTypes', [])
-
-    data = await ttc_worker.get_ttc(startDate=start,
-                                    endDate=end,
-                                    ncList=ncs,
-                                    requestTypes=requests)
-    return json(data)
-
-
-@app.route('/timetoclose-comparison', methods=["POST"])
-@compress.compress()
-async def timetoclose_comparison(request):
-    ttc_worker = TimeToCloseService(app.config['Settings'])
-
-    postArgs = request.json
-    startDate = postArgs.get('startDate', None)
-    endDate = postArgs.get('endDate', None)
-    requestTypes = postArgs.get('requestTypes', [])
-    set1 = postArgs.get('set1', None)
-    set2 = postArgs.get('set2', None)
-
-    data = await ttc_worker.get_ttc_comparison(startDate=startDate,
-                                               endDate=endDate,
-                                               requestTypes=requestTypes,
-                                               set1=set1,
-                                               set2=set2)
-    return json(data)
-
-
-@app.route('/requestfrequency', methods=["POST"])
-@compress.compress()
-async def requestfrequency(request):
-    freq_worker = FrequencyService(app.config['Settings'])
-
-    postArgs = request.json
-    startDate = postArgs.get('startDate', None)
-    endDate = postArgs.get('endDate', None)
-    ncList = postArgs.get('ncList', [])
-    requestTypes = postArgs.get('requestTypes', [])
-
-    data = await freq_worker.get_frequency(startDate=startDate,
-                                           endDate=endDate,
-                                           ncList=ncList,
-                                           requestTypes=requestTypes)
-    return json(data)
-
-
-@app.route('/requestfrequency-comparison', methods=["POST"])
-@compress.compress()
-async def requestfrequency_comparison(request):
-    worker = FrequencyService(app.config['Settings'])
-
-    postArgs = request.json
-    startDate = postArgs.get('startDate', None)
-    endDate = postArgs.get('endDate', None)
-    requestTypes = postArgs.get('requestTypes', [])
-    set1 = postArgs.get('set1', None)
-    set2 = postArgs.get('set2', None)
-
-    data = await worker.get_frequency_comparison(startDate=startDate,
-                                                 endDate=endDate,
-                                                 requestTypes=requestTypes,
-                                                 set1=set1,
-                                                 set2=set2)
-    return json(data)
-
-
 @app.route('/ingest', methods=["GET"])
 @compress.compress()
 async def ingest(request):
@@ -209,23 +133,6 @@ async def ingest(request):
     return json(data)
 
 
-@app.route('/pins', methods=["POST"])
-@compress.compress()
-async def pinMap(request):
-    pin_worker = PinService(app.config['Settings'])
-    postArgs = request.json
-    start = postArgs.get('startDate', '2015-01-01')
-    end = postArgs.get('endDate', '2015-12-31 01:01:01')
-    ncs = postArgs.get('ncList', ['SHERMAN OAKS NC'])
-    requests = postArgs.get('requestTypes', ['Bulky Items'])
-
-    return_data = await pin_worker.get_base_pins(startDate=start,
-                                                 endDate=end,
-                                                 ncList=ncs,
-                                                 requestTypes=requests)
-    return json(return_data)
-
-
 @app.route('/pin-clusters', methods=["POST"])
 @compress.compress()
 async def pinClusters(request):
@@ -263,53 +170,51 @@ async def heatmap(request):
     return json(heatmap)
 
 
-@app.route('/requestcounts', methods=["POST"])
+@app.route('/servicerequest/<srnumber>', methods=["GET"])
+async def requestDetails(request, srnumber):
+    detail_worker = RequestDetailService(app.config['Settings'])
+
+    return_data = await detail_worker.get_request_detail(srnumber)
+    return json(return_data)
+
+
+@app.route('/visualizations', methods=["POST"])
 @compress.compress()
-async def requestCounts(request):
-    counts_worker = RequestCountsService(app.config['Settings'])
+async def visualizations(request):
+    worker = VisualizationsService()
+
     postArgs = request.json
     start = postArgs.get('startDate', None)
     end = postArgs.get('endDate', None)
     ncs = postArgs.get('ncList', [])
     requests = postArgs.get('requestTypes', [])
-    countFields = postArgs.get('countFields', [])
 
-    return_data = await counts_worker.get_req_counts(startDate=start,
-                                                     endDate=end,
-                                                     ncList=ncs,
-                                                     requestTypes=requests,
-                                                     countFields=countFields)
-    return json(return_data)
+    data = await worker.visualizations(startDate=start,
+                                       endDate=end,
+                                       requestTypes=requests,
+                                       ncList=ncs)
+    return json(data)
 
 
-@app.route('/requestcounts-comparison', methods=["POST"])
+@app.route('/comparison/<type>', methods=["POST"])
 @compress.compress()
-async def requestCountsComparison(request):
-    worker = RequestCountsService(app.config['Settings'])
+async def comparison(request, type):
+    worker = ComparisonService()
 
     postArgs = request.json
     startDate = postArgs.get('startDate', None)
     endDate = postArgs.get('endDate', None)
     requestTypes = postArgs.get('requestTypes', [])
     set1 = postArgs.get('set1', None)
     set2 = postArgs.get('set2', None)
-    countFields = postArgs.get('countFields', [])
-
-    data = await worker.get_req_counts_comparison(startDate=startDate,
-                                                  endDate=endDate,
-                                                  requestTypes=requestTypes,
-                                                  set1=set1,
-                                                  set2=set2,
-                                                  countFields=countFields)
-    return json(data)
 
-
-@app.route('/servicerequest/<srnumber>', methods=["GET"])
-async def requestDetails(request, srnumber):
-    detail_worker = RequestDetailService(app.config['Settings'])
-
-    return_data = await detail_worker.get_request_detail(srnumber)
-    return json(return_data)
+    data = await worker.comparison(type=type,
+                                   startDate=startDate,
+                                   endDate=endDate,
+                                   requestTypes=requestTypes,
+                                   set1=set1,
+                                   set2=set2)
+    return json(data)
 
 
 @app.route('/feedback', methods=["POST"])