fix: cleanups

metrotranscom · Mar 8, 2024 · 585574e · 585574e
1 parent 58275f5
commit 585574e
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 35 deletions.
diff --git a/.github/workflows/cypress_public.yml b/.github/workflows/cypress_public.yml
@@ -104,7 +104,7 @@ jobs:
           build: yarn build
           start: yarn dev:new-backend, yarn start
           wait-on: 'http://localhost:3100/jurisdictions'
-          record: true # set this value to true to record videos in cypress cloud for debugging purposes - skip passing tests
+          record: false # set this value to true to record videos in cypress cloud for debugging purposes - skip passing tests
         env:
           CYPRESS_RECORD_KEY: ${{ secrets.PUBLIC_CYPRESS_RECORD_KEY }}
 

diff --git a/api/.env.template b/api/.env.template
@@ -44,3 +44,10 @@ CORS_ORIGINS=["http://localhost:3000", "http://localhost:3001"]
 CORS_REGEX=["test1", "test2"]
 # controls the repetition of the temp file clearing cron job
 TEMP_FILE_CLEAR_CRON_STRING=0 * * *
+
+# Doorway specific values
+ASSET_UPLOAD_MAX_SIZE=
+ASSET_FILE_SERVICE=
+ASSET_FS_CONFIG_s3_REGION=
+ASSET_FS_CONFIG_s3_BUCKET=
+ASSET_FS_CONFIG_s3_URL_FORMAT=public
diff --git a/api/prisma/seed-helpers/translation-factory.ts b/api/prisma/seed-helpers/translation-factory.ts
@@ -16,8 +16,7 @@ const translations = (jurisdictionName?: string) => ({
     footer: `${jurisdictionName || 'Bloom Housing'}`,
   },
   header: {
-    logoUrl:
-      'https://res.cloudinary.com/exygy/image/upload/v1692118607/core/bloom_housing_logo.png',
+    logoUrl: 'https://housingbayarea.mtc.ca.gov/images/doorway-logo.png',
     logoTitle: 'Bloom Housing Portal',
   },
   invite: {

diff --git a/api/prisma/seed-helpers/user-factory.ts b/api/prisma/seed-helpers/user-factory.ts
@@ -22,14 +22,16 @@ export const userFactory = async (optionalParams?: {
   firstName: optionalParams?.firstName || 'First',
   lastName: optionalParams?.lastName || 'Last',
   passwordHash: await passwordToHash('abcdef'),
-  userRoles: {
-    create: {
-      isAdmin: optionalParams?.roles?.isAdmin || false,
-      isJurisdictionalAdmin:
-        optionalParams?.roles?.isJurisdictionalAdmin || false,
-      isPartner: optionalParams?.roles?.isPartner || false,
-    },
-  },
+  userRoles: optionalParams?.roles
+    ? {
+        create: {
+          isAdmin: optionalParams?.roles?.isAdmin || false,
+          isJurisdictionalAdmin:
+            optionalParams?.roles?.isJurisdictionalAdmin || false,
+          isPartner: optionalParams?.roles?.isPartner || false,
+        },
+      }
+    : undefined,
   mfaCode: optionalParams?.mfaCode || null,
   mfaEnabled: optionalParams?.mfaEnabled || false,
   confirmedAt: optionalParams?.confirmedAt || null,

diff --git a/api/prisma/seed-staging.ts b/api/prisma/seed-staging.ts
@@ -72,7 +72,6 @@ export const stagingSeed = async (
   await prismaClient.jurisdictions.create({
     data: jurisdictionFactory('San Francisco'),
   });
-  // Alameda,Contra%20Costa,Marin,Napa,San%20Mateo,Santa%20Clara,Solano,Sonoma,San%20Francisco
   // create admin user
   await prismaClient.userAccounts.create({
     data: await userFactory({
@@ -113,6 +112,14 @@ export const stagingSeed = async (
       mfaCode: '12345',
     }),
   });
+  await prismaClient.userAccounts.create({
+    data: await userFactory({
+      email: '[email protected]',
+      confirmedAt: new Date(),
+      jurisdictionIds: [jurisdiction.id],
+      acceptedTerms: false,
+    }),
+  });
   // add jurisdiction specific translations and default ones
   await prismaClient.translations.create({
     data: translationFactory(jurisdiction.id, jurisdiction.name),

diff --git a/api/src/dtos/assets/asset.dto.ts b/api/src/dtos/assets/asset.dto.ts
@@ -7,7 +7,7 @@ import { ApiProperty } from '@nestjs/swagger';
 export class Asset extends AbstractDTO {
   @Expose()
   @IsString({ groups: [ValidationsGroupsEnum.default] })
-  @MaxLength(128, { groups: [ValidationsGroupsEnum.default] })
+  @MaxLength(256, { groups: [ValidationsGroupsEnum.default] })
   @IsDefined({ groups: [ValidationsGroupsEnum.default] })
   @ApiProperty()
   fileId: string;

diff --git a/api/test/unit/services/asset.service.spec.ts b/api/test/unit/services/asset.service.spec.ts
@@ -23,24 +23,8 @@ describe('Testing asset service', () => {
         AssetService,
         PrismaService,
         ConfigService,
-        // { provide: UploadService, useValue: {} },
         { provide: FileServiceProvider, useValue: {} },
         { provide: UploadService, useClass: CloudinaryService },
-        // {
-        //   provide: FileServiceProvider,
-        //   useFactory: (): FileServiceProvider => {
-        //     // the constructor is where we define which service to use by default
-        //     return (
-        //       new FileServiceProvider(process.env.ASSET_FILE_SERVICE)
-        //         // register the null file service
-        //         .registerFileService('null', new NullFileService())
-        //         // register the Amazon S3 file service
-        //         .registerFileService('s3', new AmazonS3FileService())
-        //         // configure() will filter out the config values we actually need
-        //         .configure(process.env, 'ASSET_FS_CONFIG_')
-        //     );
-        //   },
-        // },
       ],
     }).compile();
 

diff --git a/backend/core/src/translations/services/translations.service.ts b/backend/core/src/translations/services/translations.service.ts
@@ -68,7 +68,6 @@ export class TranslationsService extends AbstractServiceFactory<
   }
 
   public async translateListing(listing: Listing, language: Language) {
-    console.log("translateListing", listing)
     if (!this.googleTranslateService.isConfigured()) {
       console.warn("listing translation requested, but google translate service is not configured")
       return
@@ -158,12 +157,10 @@ export class TranslationsService extends AbstractServiceFactory<
       Object.keys(listingPathsAndValues).length > 0 &&
       (!persistedTranslatedValues || persistedTranslatedValues.timestamp < listing.updatedAt)
     ) {
-      console.log("newTranslation")
       const newTranslations = await this.googleTranslateService.fetch(
         Object.values(listingPathsAndValues),
         language
       )
-      console.log("after", newTranslations)
       persistedTranslatedValues = await this.persistTranslatedValues(
         persistedTranslatedValues?.id,
         listing,

diff --git a/shared-helpers/__tests__/testHelpers.ts b/shared-helpers/__tests__/testHelpers.ts
@@ -166,9 +166,6 @@ export const listing: Listing = {
   jurisdictions: {
     id: "id",
     name: "San Jose",
-    // publicUrl: "",
-    // enableAccessibilityFeatures: false,
-    // enableUtilitiesIncluded: false,
   },
   depositMax: "",
   disableUnitsAccordion: false,