chore: continue progress in fixing variable issue

Azure-Samples · Jan 25, 2023 · 4fd17f0 · 4fd17f0
1 parent d6a8b4e
commit 4fd17f0
Show file tree

Hide file tree

Showing 6 changed files with 102 additions and 22 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/api/get-listing-by-id/index.ts b/packages/api/get-listing-by-id/index.ts
@@ -3,12 +3,12 @@ import pg from 'pg';
 export async function getListingById(context: any, req: any) {
     try {
         const client = new pg.Client({
-            user: process.env.POSTGRESQL_USER,
-            password: process.env.POSTGRESQL_PASSWORD,
-            host: process.env.POSTGRESQL_HOST,
-            port: Number(process.env.POSTGRESQL_PORT),
-            database: process.env.POSTGRESQL_DATABASE,
-            ssl: true
+          user: process.env.DATABASE_USERNAME,
+          password: process.env.DATABASE_PASSWORD,
+          host: process.env.DATABASE_HOST,
+          port: Number(process.env.DATABASE_PORT),
+          database: process.env.DATABASE_NAME,
+          ssl: true
         });
         await client.connect();
 

diff --git a/packages/api/get-listings/index.ts b/packages/api/get-listings/index.ts
@@ -1,13 +1,15 @@
 import pg from 'pg';
 
 export async function main(context: any, req: any) {
+  const connectionString = process.env['ConnectionStrings:cosmosdb'];
+  context.log(connectionString, '#####connection string');
     try {
         const client = new pg.Client({
-            user: process.env.POSTGRESQL_USER,
-            password: process.env.POSTGRESQL_PASSWORD,
-            host: process.env.POSTGRESQL_HOST,
-            port: Number(process.env.POSTGRESQL_PORT),
-            database: process.env.POSTGRESQL_DATABASE,
+            user: process.env.DATABASE_USERNAME,
+            password: process.env.DATABASE_PASSWORD,
+            host: process.env.DATABASE_HOST,
+            port: Number(process.env.DATABASE_PORT),
+            database: process.env.DATABASE_NAME,
             ssl: true
         });
         await client.connect();
@@ -43,10 +45,10 @@ export async function main(context: any, req: any) {
         }
 
         const result = await client.query(
-          `SELECT * FROM LISTING WHERE isFeatured = $1 LIMIT $2 OFFSET $3`,
+          `SELECT * FROM LISTING WHERE isfeatured = $1 LIMIT $2 OFFSET $3`,
           [featured, limit, offset]
         );
-        const listing = result.rows.map((row) => {
+        const listing = result.rows.map((row: any) => {
           row.fees = row.fees.split('|');
           row.photos = row.photos.split('|');
           row.address = row.address.split('|');

diff --git a/packages/api/host.json b/packages/api/host.json
@@ -10,7 +10,7 @@
   },
   "extensionBundle": {
     "id": "Microsoft.Azure.Functions.ExtensionBundle",
-    "version": "[2.*, 3.0.0)"
+    "version": "3.0.0"
   },
   "extensions": {
     "http": {

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@azure/functions": "^1.2.3",
     "@faker-js/faker": "^7.5.0",
-    "@types/node": "^18.11.18",
+    "@types/pg": "^8.6.6",
     "@types/swagger-ui-dist": "^3.30.1",
     "@types/yamljs": "^0.2.31",
     "@typescript-eslint/eslint-plugin": "^5.48.1",

diff --git a/swa-cli.config.json b/swa-cli.config.json
@@ -10,7 +10,7 @@
       "run": "npm start",
       "appDevserverUrl": "http://localhost:4200",
       "appName": "nv-contoso-portal-app",
-      "resourceGroup": "nv-contoso-portal-app-rg"
+      "resourceGroup": "nv-contoso-deployments"
     }
   }
 }