Merge pull request #33 from bloom-housing/release/3-12-26

feat: release 3-12-26

Author: emilyjablonski

api/Dockerfile

@@ -45,6 +45,9 @@ COPY --from=build /build/prisma/schema.prisma ./prisma/schema.prisma
 COPY --from=build /build/prisma/migrations ./prisma/migrations
 COPY --from=build /build/node_modules/.prisma ./node_modules/.prisma
 
+# Make sure directory for csv exports exists.
+WORKDIR /bloom_api/src/temp
+
 # Create a non-root user to run (principle of least privilege).
 WORKDIR /bloom_api
 RUN groupadd --gid 2002 bloom_api && useradd --gid 2002 --uid 2002 --home /bloom_api bloom_api

api/dbinit/rds.init.sql

@@ -19,10 +19,10 @@ BEGIN
     IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = 'bloom_api') THEN
         CREATE USER bloom_api;
         GRANT rds_iam TO bloom_api;
-        GRANT CONNECT ON DATABASE bloom_prisma TO bloom_api;
-        GRANT ALL PRIVILEGES ON DATABASE bloom_prisma TO bloom_api;
-        GRANT ALL PRIVILEGES ON SCHEMA public TO bloom_api;
     END IF;
+    GRANT CONNECT ON DATABASE bloom_prisma TO bloom_api;
+    GRANT ALL PRIVILEGES ON DATABASE bloom_prisma TO bloom_api;
+    GRANT ALL PRIVILEGES ON SCHEMA public TO bloom_api;
 END
 $$;
 
@@ -33,10 +33,10 @@ BEGIN
     IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = 'bloom_readonly') THEN
         CREATE USER bloom_readonly;
         GRANT rds_iam TO bloom_readonly;
-        GRANT CONNECT ON DATABASE bloom_prisma TO bloom_readonly;
-        GRANT USAGE ON SCHEMA public TO bloom_readonly;
-        GRANT USAGE ON ALL SEQUENCES IN SCHEMA public TO bloom_readonly;
     END IF;
+    GRANT CONNECT ON DATABASE bloom_prisma TO bloom_readonly;
+    GRANT USAGE ON SCHEMA public TO bloom_readonly;
+    GRANT USAGE ON ALL SEQUENCES IN SCHEMA public TO bloom_readonly;
 END
 $$;
 

api/prisma/seed-helpers/asset-file-id-helper.ts

@@ -0,0 +1,16 @@
+/**
+ * Returns the appropriate fileId for a Cloudinary asset based on the
+ * DBSEED_USE_FULL_CLOUDINARY_URL_AS_FILE_ID environment variable.
+ *
+ * When the env var is set, returns the full Cloudinary URL:
+ *   https://res.cloudinary.com/exygy/image/upload/w_400,c_limit,q_65/<IMAGE_ID>.jpg
+ *
+ * Otherwise, returns the image ID as-is.
+ */
+export function assetFileId(imageId: string): string {
+  if (process.env.DBSEED_USE_FULL_CLOUDINARY_URL_AS_FILE_ID) {
+    const size = process.env.LISTING_PHOTO_SIZE || '1302';
+    return `https://res.cloudinary.com/exygy/image/upload/w_${size},c_limit,q_65/${imageId}.jpg`;
+  }
+  return imageId;
+}

api/prisma/seed-helpers/listing-data/blue-sky-apartments.ts

@@ -12,6 +12,7 @@ import {
   yellowstoneAddress,
   yosemiteAddress,
 } from '../address-factory';
+import { assetFileId } from '../asset-file-id-helper';
 
 export const blueSkyApartments: Prisma.ListingsCreateInput = {
   additionalApplicationSubmissionNotes: null,
@@ -106,7 +107,7 @@ export const blueSkyApartments: Prisma.ListingsCreateInput = {
         assets: {
           create: {
             label: 'cloudinaryBuilding',
-            fileId: 'dev/trayan-xIOYJSVEZ8c-unsplash_f1axsg',
+            fileId: assetFileId('dev/trayan-xIOYJSVEZ8c-unsplash_f1axsg'),
           },
         },
       },

api/prisma/seed-helpers/listing-data/elm-village.ts

@@ -7,6 +7,7 @@ import {
 } from '@prisma/client';
 import dayjs from 'dayjs';
 import { featuresAndUtilites } from '../listing-factory';
+import { assetFileId } from '../asset-file-id-helper';
 
 export const elmVillage: Prisma.ListingsCreateInput = {
   additionalApplicationSubmissionNotes: null,
@@ -103,7 +104,9 @@ export const elmVillage: Prisma.ListingsCreateInput = {
         assets: {
           create: {
             label: 'cloudinaryBuilding',
-            fileId: 'dev/krzysztof-hepner-V7Q0Oh3Az-c-unsplash_xoj7sr',
+            fileId: assetFileId(
+              'dev/krzysztof-hepner-V7Q0Oh3Az-c-unsplash_xoj7sr',
+            ),
           },
         },
       },
@@ -112,7 +115,9 @@ export const elmVillage: Prisma.ListingsCreateInput = {
         assets: {
           create: {
             label: 'cloudinaryBuilding',
-            fileId: 'dev/blake-wheeler-zBHU08hdzhY-unsplash_swqash',
+            fileId: assetFileId(
+              'dev/blake-wheeler-zBHU08hdzhY-unsplash_swqash',
+            ),
           },
         },
       },

api/prisma/seed-helpers/listing-data/hollywood-hills-heights.ts

@@ -6,6 +6,7 @@ import {
 } from '@prisma/client';
 import { yellowstoneAddress } from '../address-factory';
 import dayjs from 'dayjs';
+import { assetFileId } from '../asset-file-id-helper';
 
 export const hollywoodHillsHeights: Prisma.ListingsCreateInput = {
   additionalApplicationSubmissionNotes: null,
@@ -96,7 +97,7 @@ export const hollywoodHillsHeights: Prisma.ListingsCreateInput = {
         assets: {
           create: {
             label: 'cloudinaryBuilding',
-            fileId: 'dev/apartment_building_2_b7ujdd',
+            fileId: assetFileId('dev/apartment_building_2_b7ujdd'),
           },
         },
       },
@@ -106,7 +107,9 @@ export const hollywoodHillsHeights: Prisma.ListingsCreateInput = {
         assets: {
           create: {
             label: 'cloudinaryBuilding',
-            fileId: 'dev/krzysztof-hepner-V7Q0Oh3Az-c-unsplash_xoj7sr',
+            fileId: assetFileId(
+              'dev/krzysztof-hepner-V7Q0Oh3Az-c-unsplash_xoj7sr',
+            ),
           },
         },
       },
@@ -116,7 +119,9 @@ export const hollywoodHillsHeights: Prisma.ListingsCreateInput = {
         assets: {
           create: {
             label: 'cloudinaryBuilding',
-            fileId: 'dev/blake-wheeler-zBHU08hdzhY-unsplash_swqash',
+            fileId: assetFileId(
+              'dev/blake-wheeler-zBHU08hdzhY-unsplash_swqash',
+            ),
           },
         },
       },

api/prisma/seed-helpers/listing-data/lakeview-villa.ts

@@ -7,6 +7,7 @@ import {
 } from '@prisma/client';
 import dayjs from 'dayjs';
 import { yellowstoneAddress } from '../address-factory';
+import { assetFileId } from '../asset-file-id-helper';
 
 export const lakeviewVilla: Prisma.ListingsCreateInput = {
   additionalApplicationSubmissionNotes: null,
@@ -92,7 +93,7 @@ export const lakeviewVilla: Prisma.ListingsCreateInput = {
       assets: {
         create: {
           label: 'cloudinaryBuilding',
-          fileId: 'dev/unnamed_fkxrj2',
+          fileId: assetFileId('dev/unnamed_fkxrj2'),
         },
       },
     },

api/prisma/seed-helpers/listing-data/little-village-apartments.ts

@@ -5,6 +5,7 @@ import {
   ReviewOrderTypeEnum,
 } from '@prisma/client';
 import dayjs from 'dayjs';
+import { assetFileId } from '../asset-file-id-helper';
 
 export const littleVillageApartments: Prisma.ListingsCreateInput = {
   additionalApplicationSubmissionNotes: null,
@@ -84,7 +85,7 @@ export const littleVillageApartments: Prisma.ListingsCreateInput = {
         assets: {
           create: {
             label: 'cloudinaryBuilding',
-            fileId: 'dev/dillon-kydd-2keCPb73aQY-unsplash_lm7krp',
+            fileId: assetFileId('dev/dillon-kydd-2keCPb73aQY-unsplash_lm7krp'),
           },
         },
       },

api/prisma/seed-helpers/listing-data/sunshine-flats.ts

@@ -6,6 +6,7 @@ import {
 } from '@prisma/client';
 import dayjs from 'dayjs';
 import { glacierAddress } from '../address-factory';
+import { assetFileId } from '../asset-file-id-helper';
 
 export const sunshineFlats: Prisma.ListingsCreateInput = {
   additionalApplicationSubmissionNotes: null,
@@ -90,7 +91,7 @@ export const sunshineFlats: Prisma.ListingsCreateInput = {
       assets: {
         create: {
           label: 'cloudinaryBuilding',
-          fileId: 'dev/sunshine-flats_naated',
+          fileId: assetFileId('dev/sunshine-flats_naated'),
         },
       },
     },

api/prisma/seed-helpers/listing-data/valley-heights-senior-community.ts

@@ -5,6 +5,7 @@ import {
   ReviewOrderTypeEnum,
 } from '@prisma/client';
 import dayjs from 'dayjs';
+import { assetFileId } from '../asset-file-id-helper';
 
 export const valleyHeightsSeniorCommunity: Prisma.ListingsCreateInput = {
   additionalApplicationSubmissionNotes: null,
@@ -87,7 +88,7 @@ export const valleyHeightsSeniorCommunity: Prisma.ListingsCreateInput = {
         assets: {
           create: {
             label: 'cloudinaryBuilding',
-            fileId: 'dev/apartment_ez3yyz',
+            fileId: assetFileId('dev/apartment_ez3yyz'),
           },
         },
       },
@@ -96,7 +97,7 @@ export const valleyHeightsSeniorCommunity: Prisma.ListingsCreateInput = {
         assets: {
           create: {
             label: 'cloudinaryBuilding',
-            fileId: 'dev/interior_mc9erd',
+            fileId: assetFileId('dev/interior_mc9erd'),
           },
         },
       },
@@ -105,7 +106,7 @@ export const valleyHeightsSeniorCommunity: Prisma.ListingsCreateInput = {
         assets: {
           create: {
             label: 'cloudinaryBuilding',
-            fileId: 'dev/inside_qo9wre',
+            fileId: assetFileId('dev/inside_qo9wre'),
           },
         },
       },