adds new tables for the updated safepass api

mechevarria · Jun 25, 2021 · 54bd684 · 54bd684
2 parents 7c864a2 + 1376df8
commit 54bd684
Show file tree

Hide file tree

Showing 28 changed files with 741 additions and 548 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,21 +1,21 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Debug rtwp-api",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "program": "${workspaceFolder}/rtwp-api/server.js",
-            "preLaunchTask": "npm: postinstall - rtwp-api",
-            "outFiles": [
-                "${workspaceFolder}/rtwp-api/**/*.js"
-            ]
-        }
-    ]
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Debug rtwp-api",
+      "skipFiles": [
+        "<node_internals>/**"
+      ],
+      "program": "${workspaceFolder}/rtwp-api/server.js",
+      "preLaunchTask": "npm: postinstall - rtwp-api",
+      "outFiles": [
+        "${workspaceFolder}/rtwp-api/**/*.js"
+      ]
+    }
+  ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,5 +2,6 @@
     "eslint.workingDirectories": [
         "./rtwp-api",
         "./rtwp-admin"
-    ]
+    ],
+    "editor.autoSave": "off"
 }
diff --git a/cf-db.sh b/cf-db.sh
@@ -14,4 +14,4 @@ cf deploy ./ -f
 cf create-service-key rtwp-hdi-hana rtwp-hdi-hana-key
 
 rm mtad.yaml
-rm cp-rtwp.mtar
+rm cp-rtwp.mtar
diff --git a/cf-rtwp-admin.sh b/cf-rtwp-admin.sh
@@ -1,24 +1,22 @@
 #!/usr/bin/env bash
 
-# status=$(cf app rtwp-keycloak | sed -n 3p)
-# if [[ $status = "FAILED" ]]; then
-#   exit 1
-# else
-#   keycloak_url=https://$(cf app rtwp-keycloak | awk '{print $2}' | sed -n 5p)/auth
-#   echo keycloak_url=$keycloak_url
-# fi
-
-keycloak_url='https://rtwp-keycloak.cfapps.us10.hana.ondemand.com/auth'
+status=$(cf app rtwp-keycloak | sed -n 3p)
+if [[ $status = "FAILED" ]]; then
+  exit 1
+else
+   keycloak_url=https://$(cf app rtwp-keycloak | awk '{print $2}' | sed -n 5p)/auth
+   echo keycloak_url=$keycloak_url
+fi
 
-status=$(cf app mcoleman-rtwp-api | sed -n 3p)
+status=$(cf app rtwp-api | sed -n 3p)
 if [[ $status = "FAILED" ]]; then
   exit 1
 else
-  express_url=https://$(cf app mcoleman-rtwp-api | awk '{print $2}' | sed -n 5p)/
+  express_url=https://$(cf app rtwp-api | awk '{print $2}' | sed -n 5p)/
   echo express_url=$express_url
 fi
 
-app=mcoleman-rtwp-admin
+app=rtwp-admin
 
 cd rtwp-admin
 
@@ -35,4 +33,4 @@ cf se $app KEYCLOAK_URL $keycloak_url
 cf se $app KEYCLOAK true
 cf se $app EXPRESS_URL $express_url
 
-cf start $app
+cf start $app
diff --git a/cf-rtwp-api.sh b/cf-rtwp-api.sh
@@ -35,4 +35,4 @@ cf bind-service $app $service
 
 cf start $app
 
-cd ..
+cd ..
diff --git a/db/package-lock.json b/db/package-lock.json
diff --git a/db/package.json b/db/package.json
@@ -1,7 +1,7 @@
 {
     "name": "deploy",
     "dependencies": {
-        "@sap/hdi-deploy": "3.11.11"
+        "@sap/hdi-deploy": "^4"
     },
     "engines": {
         "node": "~12.19.1",

diff --git a/db/src/CV_BADGE_LOCATION.hdbcalculationview b/db/src/CV_BADGE_LOCATION.hdbcalculationview
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Calculation:scenario xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Calculation="http://www.sap.com/ndb/BiModelCalculation.ecore" id="CV_BADGE_LOCATION" applyPrivilegeType="NONE" dataCategory="DIMENSION" dimensionType="STANDARD" schemaVersion="3.0" outputViewType="Projection" cacheInvalidationPeriod="NONE" enforceSqlExecution="false">
+<descriptions defaultDescription="CV_BADGE_LOCATION.hdbcalculationview"/>
+<localVariables/>
+<variableMappings/>
+<dataSources>
+  <DataSource id="BADGE_LOCATION">
+    <resourceUri>BADGE_LOCATION</resourceUri>
+  </DataSource>
+</dataSources>
+<calculationViews>
+  <calculationView xsi:type="Calculation:ProjectionView" id="Projection_1">
+    <viewAttributes>
+      <viewAttribute id="ID"/>
+      <viewAttribute id="LOC"/>
+      <viewAttribute id="PROB"/>
+      <viewAttribute id="SEEN"/>
+      <viewAttribute id="FLOOR"/>
+      <viewAttribute id="DEVICE_ID"/>
+      <viewAttribute id="SEEN_TS"/>
+      <viewAttribute id="LAT"/>
+      <viewAttribute id="LNG"/>
+    </viewAttributes>
+    <calculatedViewAttributes>
+      <calculatedViewAttribute id="GEO_LOC" datatype="ST_GEOMETRY" expressionLanguage="SQL">
+        <formula>ST_GeomFromText(CONCAT('POINT (', CONCAT(&quot;LNG&quot;, CONCAT(' ', CONCAT(&quot;LAT&quot;, ')')))   ))
+</formula>
+      </calculatedViewAttribute>
+    </calculatedViewAttributes>
+    <input node="BADGE_LOCATION"/>
+  </calculationView>
+</calculationViews>
+<logicalModel id="Projection_1">
+  <attributes>
+    <attribute id="ID" order="1" displayAttribute="false" attributeHierarchyActive="false">
+      <descriptions defaultDescription="ID"/>
+      <keyMapping columnObjectName="Projection_1" columnName="ID"/>
+    </attribute>
+    <attribute id="LOC" order="2" displayAttribute="false" attributeHierarchyActive="false">
+      <descriptions defaultDescription="LOC"/>
+      <keyMapping columnObjectName="Projection_1" columnName="LOC"/>
+    </attribute>
+    <attribute id="PROB" order="3" displayAttribute="false" attributeHierarchyActive="false">
+      <descriptions defaultDescription="PROB"/>
+      <keyMapping columnObjectName="Projection_1" columnName="PROB"/>
+    </attribute>
+    <attribute id="SEEN" order="4" displayAttribute="false" attributeHierarchyActive="false">
+      <descriptions defaultDescription="SEEN"/>
+      <keyMapping columnObjectName="Projection_1" columnName="SEEN"/>
+    </attribute>
+    <attribute id="FLOOR" order="5" displayAttribute="false" attributeHierarchyActive="false">
+      <descriptions defaultDescription="FLOOR"/>
+      <keyMapping columnObjectName="Projection_1" columnName="FLOOR"/>
+    </attribute>
+    <attribute id="DEVICE_ID" order="6" displayAttribute="false" attributeHierarchyActive="false">
+      <descriptions defaultDescription="DEVICE_ID"/>
+      <keyMapping columnObjectName="Projection_1" columnName="DEVICE_ID"/>
+    </attribute>
+    <attribute id="SEEN_TS" order="7" displayAttribute="false" attributeHierarchyActive="false">
+      <descriptions defaultDescription="SEEN_TS"/>
+      <keyMapping columnObjectName="Projection_1" columnName="SEEN_TS"/>
+    </attribute>
+    <attribute id="GEO_LOC" order="8" displayAttribute="false" attributeHierarchyActive="false">
+      <descriptions defaultDescription="GEO_LOC"/>
+      <keyMapping columnObjectName="Projection_1" columnName="GEO_LOC"/>
+    </attribute>
+  </attributes>
+  <calculatedAttributes/>
+  <baseMeasures/>
+  <calculatedMeasures/>
+  <restrictedMeasures/>
+</logicalModel>
+<layout>
+  <shapes>
+    <shape expanded="true" modelObjectName="Output" modelObjectNameSpace="MeasureGroup">
+      <upperLeftCorner x="40" y="85"/>
+    </shape>
+
+    <shape expanded="true" modelObjectName="Projection_1" modelObjectNameSpace="CalculationView">
+      <upperLeftCorner x="100" y="217"/>
+      <rectangleSize height="30" width="160"/>
+    </shape>
+  </shapes>
+</layout>
+</Calculation:scenario>
diff --git a/db/src/CV_BADGE_LOCATION_SAC.hdbcalculationview b/db/src/CV_BADGE_LOCATION_SAC.hdbcalculationview
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Calculation:scenario xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Calculation="http://www.sap.com/ndb/BiModelCalculation.ecore" id="CV_BADGE_LOCATION_SAC" applyPrivilegeType="NONE" dataCategory="CUBE" schemaVersion="3.0" outputViewType="Aggregation" cacheInvalidationPeriod="NONE" enforceSqlExecution="false">
+<descriptions defaultDescription="CV_BADGE_LOCATION.hdbcalculationview"/>
+<localVariables/>
+<variableMappings/>
+<dataSources>
+  <DataSource id="BADGE_LOCATION">
+    <resourceUri>BADGE_LOCATION</resourceUri>
+  </DataSource>
+</dataSources>
+<calculationViews>
+  <calculationView xsi:type="Calculation:ProjectionView" id="Projection_1">
+    <viewAttributes>
+      <viewAttribute id="ID"/>
+      <viewAttribute id="LOC"/>
+      <viewAttribute id="PROB"/>
+      <viewAttribute id="SEEN"/>
+      <viewAttribute id="FLOOR"/>
+      <viewAttribute id="DEVICE_ID"/>
+      <viewAttribute id="SEEN_TS"/>
+
+      <viewAttribute id="LAT"/>
+      <viewAttribute id="LNG"/>
+    </viewAttributes>
+    <calculatedViewAttributes>
+      <calculatedViewAttribute id="CC_1" datatype="INTEGER" expressionLanguage="SQL">
+        <formula>1</formula>
+      </calculatedViewAttribute>
+    </calculatedViewAttributes>
+    <input node="BADGE_LOCATION"/>
+  </calculationView>
+</calculationViews>
+<logicalModel id="Projection_1">
+  <attributes>
+    <attribute id="ID" order="1" displayAttribute="false" attributeHierarchyActive="false">
+      <descriptions defaultDescription="ID"/>
+      <keyMapping columnObjectName="Projection_1" columnName="ID"/>
+    </attribute>
+    <attribute id="LOC" order="2" displayAttribute="false" attributeHierarchyActive="false">
+      <descriptions defaultDescription="LOC"/>
+      <keyMapping columnObjectName="Projection_1" columnName="LOC"/>
+    </attribute>
+    <attribute id="PROB" order="3" displayAttribute="false" attributeHierarchyActive="false">
+      <descriptions defaultDescription="PROB"/>
+      <keyMapping columnObjectName="Projection_1" columnName="PROB"/>
+    </attribute>
+    <attribute id="SEEN" order="4" displayAttribute="false" attributeHierarchyActive="false">
+      <descriptions defaultDescription="SEEN"/>
+      <keyMapping columnObjectName="Projection_1" columnName="SEEN"/>
+    </attribute>
+    <attribute id="FLOOR" order="5" displayAttribute="false" attributeHierarchyActive="false">
+      <descriptions defaultDescription="FLOOR"/>
+      <keyMapping columnObjectName="Projection_1" columnName="FLOOR"/>
+    </attribute>
+    <attribute id="DEVICE_ID" order="6" displayAttribute="false" attributeHierarchyActive="false">
+      <descriptions defaultDescription="DEVICE_ID"/>
+      <keyMapping columnObjectName="Projection_1" columnName="DEVICE_ID"/>
+    </attribute>
+    <attribute id="SEEN_TS" order="7" displayAttribute="false" attributeHierarchyActive="false">
+      <descriptions defaultDescription="SEEN_TS"/>
+      <keyMapping columnObjectName="Projection_1" columnName="SEEN_TS"/>
+    </attribute></attributes>
+  <calculatedAttributes/>
+  <baseMeasures>
+    <measure id="CC_1" order="8" aggregationType="sum" measureType="simple">
+      <descriptions defaultDescription="CC_1"/>
+      <measureMapping columnObjectName="Projection_1" columnName="CC_1"/>
+    </measure>
+  </baseMeasures>
+  <calculatedMeasures/>
+  <restrictedMeasures/>
+  <localDimensions/>
+</logicalModel>
+<layout>
+  <shapes>
+    <shape expanded="true" modelObjectName="Output" modelObjectNameSpace="MeasureGroup">
+      <upperLeftCorner x="40" y="85"/>
+    </shape>
+
+    <shape expanded="true" modelObjectName="Projection_1" modelObjectNameSpace="CalculationView">
+      <upperLeftCorner x="105" y="215"/>
+      <rectangleSize height="30" width="160"/>
+    </shape>
+  </shapes>
+</layout>
+</Calculation:scenario>
diff --git a/db/src/CV_TEST.hdbcalculationview b/db/src/CV_TEST.hdbcalculationview
@@ -35,10 +35,6 @@
     <attribute id="DEVICE_ID" order="6" displayAttribute="false" attributeHierarchyActive="false">
       <descriptions defaultDescription="DEVICE_ID"/>
       <keyMapping columnObjectName="BADGE_LOCATION" columnName="DEVICE_ID"/>
-    </attribute>
-    <attribute id="GEO_LOC" order="7" displayAttribute="false" attributeHierarchyActive="false">
-      <descriptions defaultDescription="GEO_LOC"/>
-      <keyMapping columnObjectName="BADGE_LOCATION" columnName="GEO_LOC"/>
     </attribute></attributes>
   <calculatedAttributes/>
   <baseMeasures/>

diff --git a/db/src/CV_TEST_SAC.hdbcalculationview b/db/src/CV_TEST_SAC.hdbcalculationview
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Calculation:scenario xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Calculation="http://www.sap.com/ndb/BiModelCalculation.ecore" id="CV_TEST_SAC" applyPrivilegeType="NONE" dataCategory="CUBE" schemaVersion="3.0" outputViewType="Aggregation" cacheInvalidationPeriod="NONE" enforceSqlExecution="false">
+<descriptions defaultDescription="CV_TEST_SAC.hdbcalculationview"/>
+<localVariables/>
+<variableMappings/>
+<dataSources>
+  <DataSource id="VISIT">
+    <resourceUri>VISIT</resourceUri>
+  </DataSource>
+</dataSources>
+<calculationViews>
+  <calculationView xsi:type="Calculation:ProjectionView" id="Projection_1">
+    <viewAttributes>
+      <viewAttribute id="VISITOR_NAME"/>
+    </viewAttributes>
+    <calculatedViewAttributes>
+      <calculatedViewAttribute id="CC_COUNTER" datatype="INTEGER" expressionLanguage="SQL">
+        <formula>1</formula>
+      </calculatedViewAttribute>
+    </calculatedViewAttributes>
+    <input node="VISIT"/>
+  </calculationView>
+</calculationViews>
+<logicalModel id="Projection_1">
+  <attributes>
+    <attribute id="VISITOR_NAME" order="1" displayAttribute="false" attributeHierarchyActive="false">
+      <descriptions defaultDescription="VISITOR_NAME"/>
+      <keyMapping columnObjectName="Projection_1" columnName="VISITOR_NAME"/>
+    </attribute>
+  </attributes>
+  <calculatedAttributes/>
+  <baseMeasures>
+    <measure id="CC_COUNTER" order="2" aggregationType="sum" measureType="simple">
+      <descriptions defaultDescription="CC_COUNTER"/>
+      <measureMapping columnObjectName="Projection_1" columnName="CC_COUNTER"/>
+    </measure>
+  </baseMeasures>
+  <calculatedMeasures/>
+  <restrictedMeasures/>
+  <localDimensions/>
+</logicalModel>
+<layout>
+  <shapes>
+    <shape expanded="true" modelObjectName="Output" modelObjectNameSpace="MeasureGroup">
+      <upperLeftCorner x="40" y="85"/>
+    </shape>
+
+    <shape expanded="true" modelObjectName="Projection_1" modelObjectNameSpace="CalculationView">
+      <upperLeftCorner x="100" y="196"/>
+      <rectangleSize height="30" width="160"/>
+    </shape>
+  </shapes>
+</layout>
+</Calculation:scenario>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,4 +35,4 @@ cf bind-service $app $service

		cf start $app

		cd ..
		cd ..