using letter uuid for letter filetype

.github/workflows/production.yml

@@ -28,7 +28,7 @@ jobs:
   deploy-server:
     name: 🚀 Deploy server
     needs: test-client
-    environment: 
+    environment:
       name: production
       url: https://applicants-api.nycplanningdigital.com
     runs-on: ubuntu-latest
@@ -46,6 +46,7 @@ jobs:
           appdir: server
         env:
           HD_FEATURE_FLAG_SELF_SERVICE: ${{ vars.FEATURE_FLAG_SELF_SERVICE }}
+          HD_LETTER_FILETYPE_UUID: ${{ vars.LETTER_FILETYPE_UUID }}
           HD_ADO_PRINCIPAL: ${{ secrets.ADO_PRINCIPAL }}
           HD_AUTHORITY_HOST_URL: ${{ secrets.AUTHORITY_HOST_URL }}
           HD_CITYPAY_AGENCYID: ${{ secrets.CITYPAY_AGENCYID }}
@@ -107,7 +108,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 12.x
-      - name: Install application dependencies 
+      - name: Install application dependencies
         working-directory: client
         run: yarn install --immutable --immutable-cache --check-cache
       - name: Build client

.github/workflows/qa.yml

@@ -46,6 +46,7 @@ jobs:
           appdir: server
         env:
           HD_FEATURE_FLAG_SELF_SERVICE: ${{ vars.FEATURE_FLAG_SELF_SERVICE }}
+          HD_LETTER_FILETYPE_UUID: ${{ vars.LETTER_FILETYPE_UUID }}
           HD_ADO_PRINCIPAL: ${{ secrets.ADO_PRINCIPAL }}
           HD_AUTHORITY_HOST_URL: ${{ secrets.AUTHORITY_HOST_URL }}
           HD_CITYPAY_AGENCYID: ${{ secrets.CITYPAY_AGENCYID }}
@@ -102,7 +103,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 12.x
-      - name: Install application dependencies 
+      - name: Install application dependencies
         working-directory: client
         run: yarn install --immutable --immutable-cache --check-cache
       - name: Build client
@@ -119,4 +120,3 @@ jobs:
           --site ${{secrets.NETLIFY_SITE_ID}} \
           --auth ${{secrets.NETLIFY_AUTH_TOKEN}} \
           --message "${{ github.event.head_commit.message }}"
-

.github/workflows/staging.yml

@@ -50,6 +50,7 @@ jobs:
           appdir: server
         env:
           HD_FEATURE_FLAG_SELF_SERVICE: ${{ vars.FEATURE_FLAG_SELF_SERVICE }}
+          HD_LETTER_FILETYPE_UUID: ${{ vars.LETTER_FILETYPE_UUID }}
           HD_ADO_PRINCIPAL: ${{ secrets.ADO_PRINCIPAL }}
           HD_AUTHORITY_HOST_URL: ${{ secrets.AUTHORITY_HOST_URL }}
           HD_CLIENT_ID: ${{ secrets.CLIENT_ID }}
@@ -94,7 +95,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 12.x
-      - name: Install application dependencies 
+      - name: Install application dependencies
         working-directory: client
         run: yarn install
       - name: Build client

client/app/components/packages/attachments.js

@@ -30,7 +30,7 @@ export default class PackagesAttachmentsComponent extends Component {
   @action
   trackFileForUpload() {
     this.fileManager.trackFileForUpload();
-    console.log('attachments js uploaded files', this.fileManager);
+
     this.args.package.documents = [...this.args.package.documents, ...this.fileManager.filesToUpload.files];
   }
 

client/app/components/projects/new.js

@@ -96,15 +96,18 @@ export default class ProjectsNewFormComponent extends Component {
               dcpApplicanttype: this.args.package.applicantType.code,
               dcpProjectbrief: this.args.package.projectBrief,
               _dcpApplicantadministratorCustomerValue:
-                verifiedPrimaryContact.id,
+              verifiedPrimaryContact.id,
               _dcpApplicantCustomerValue: verifiedApplicant.id,
             },
           },
         }),
       });
       const { data: project } = await response.json();
-      console.log(`project in new.js conponent`, project);
+
+      this.args.package.saveAttachedFiles(project.attributes['dcp-artifactsid']);
+
       this.router.transitionTo('project', project.id);
+
     } catch {
       /* eslint-disable-next-line no-console */
       console.error('Error while creating project');

client/app/components/projects/projects-new-attachments.js

@@ -31,7 +31,6 @@ export default class ProjectsNewAttachmentsComponent extends Component {
   @action
   trackFileForUpload() {
     /* eslint-disable-next-line no-console */
-    console.log('projects new attachments js uploaded files', this.fileManager);
     this.fileManager.trackFileForUpload();
     this.args.package.documents = [
       ...this.args.package.documents,

client/app/models/artifact.js

@@ -50,7 +50,6 @@ export default class ArtifactModel extends Model {
     this.fileUploadErrors = null;
 
     try {
-      console.log(`fileManager in artifact js`, this.fileManager);
       await this.fileManager.save();
     } catch (e) {
       console.log('Error saving files: ', e);

client/app/models/project-new.js

@@ -8,21 +8,24 @@ export default class ProjectNew extends Model {
     if (this.fileManager) {
       this.fileManager.existingFiles = this.documents;
     } else {
-      const fileQueue = this.fileQueue.create(
-        `artifact${this.id}`,
-      );
+      const fileQueue = this.fileQueue.create(`artifact${this.id}`);
 
       this.fileManager = new FileManager(
         this.id,
         'artifact',
         this.documents,
         [],
         fileQueue,
-        this.session,
+        this.session
       );
     }
   }
 
+  // Since file upload doesn't perform requests through
+  // an Ember Model save() process, it doesn't automatically
+  // hydrate the package.adapterError property. When an error occurs
+  // during upload we have to manually hydrate a custom error property
+  // to trigger the error box displayed to the user.
   @tracked
   fileUploadErrors = null;
 
@@ -99,4 +102,23 @@ export default class ProjectNew extends Model {
     defaultValue: () => [],
   })
   documents;
+
+  async saveAttachedFiles(instanceId) {
+    try {
+      await this.fileManager.save(instanceId);
+    } catch (e) {
+      console.log('Error saving files: ', e); // eslint-disable-line no-console
+
+      // See comment on the tracked fileUploadError property
+      // definition above.
+      this.fileUploadErrors = [
+        {
+          code: 'UPLOAD_DOC_FAILED',
+          title: 'Failed to upload documents',
+          detail:
+            'An error occured while  uploading your documents. Please refresh and retry.',
+        },
+      ];
+    }
+  }
 }

client/app/services/file-manager.js

@@ -12,7 +12,10 @@ export default class FileManager {
     filesToUpload, // EmberFileUpload Queue Object
     session,
   ) {
-    console.assert(entityType === 'package' || entityType === 'artifact', "entityType must be 'package' or 'artifact'");
+    console.assert(
+      entityType === 'package' || entityType === 'artifact',
+      "entityType must be 'package' or 'artifact'"
+    );
 
     this.recordId = recordId;
     this.entityType = entityType;
@@ -61,18 +64,23 @@ export default class FileManager {
     this.numFilesToUpload -= 1;
   }
 
-  async uploadFiles() {
+  async uploadFiles(instanceId = this.recordId) {
     for (let i = 0; i < this.filesToUpload.files.length; i += 1) {
-      await this.filesToUpload.files[i].upload(`${ENV.host}/documents/${this.entityType}`, { // eslint-disable-line
-        fileKey: 'file',
-        headers: {
-          Authorization: `Bearer ${this.session.data.authenticated.access_token}`,
-        },
-        data: {
-          instanceId: this.recordId,
-          entityName: this.entityType === 'artifact' ? 'dcp_artifacts' : 'dcp_package',
-        },
-      });
+      await this.filesToUpload.files[i].upload(
+        `${ENV.host}/documents/${this.entityType}`,
+        {
+          // eslint-disable-line
+          fileKey: 'file',
+          headers: {
+            Authorization: `Bearer ${this.session.data.authenticated.access_token}`,
+          },
+          data: {
+            instanceId,
+            entityName:
+              this.entityType === 'artifact' ? 'dcp_artifacts' : 'dcp_package',
+          },
+        }
+      );
     }
   }
 
@@ -82,23 +90,26 @@ export default class FileManager {
     // TODO: If this is not possible, rework this to be a
     // POST request to a differently named endpoint, like
     // deleteDocument
-    return Promise.all(this.filesToDelete.map((file) => fetch(
-      `${ENV.host}/documents?serverRelativeUrl=${file.serverRelativeUrl}`, {
-        method: 'DELETE',
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-          Authorization: `Bearer ${this.session.data.authenticated.access_token}`,
-        },
-      },
-    )));
+    return Promise.all(
+      this.filesToDelete.map((file) =>
+        fetch(
+          `${ENV.host}/documents?serverRelativeUrl=${file.serverRelativeUrl}`,
+          {
+            method: 'DELETE',
+            credentials: 'include',
+            headers: {
+              'Content-Type': 'application/json',
+              Authorization: `Bearer ${this.session.data.authenticated.access_token}`,
+            },
+          }
+        )
+      )
+    );
   }
 
-  async save() {
+  async save(instanceId) {
     // See TODO at top of this file.
-    console.log(`Saving uploads: ${ENV.host}/documents/${this.entityType}`);
-
-    await this.uploadFiles();
+    await this.uploadFiles(instanceId);
 
     await this.deleteFiles();
 

server/src/artifacts/artifacts.service.ts

@@ -7,13 +7,15 @@ import { ConfigService } from '../config/config.service';
 @Injectable()
 export class ArtifactService {
   rerFiletypeUuid = '';
+  letterFiletypeUuid= '';
 
   constructor(
     private readonly crmService: CrmService,
     private readonly sharepointService: SharepointService,
     private readonly config: ConfigService,
   ) {
     this.rerFiletypeUuid = this.config.get('RER_FILETYPE_UUID');
+    this.letterFiletypeUuid = this.config.get('LETTER_FILETYPE_UUID');
   }
 
   public async createEquityReport(projectId: string) {
@@ -47,7 +49,6 @@ export class ArtifactService {
 
   public async createProjectInitiationArtifacts(projectId: string) {
     let newArtifact = null;
-    console.log(`project id: ${projectId}`);
 
     try {
       newArtifact = this.crmService.create('dcp_artifactses', {
@@ -56,13 +57,11 @@ export class ArtifactService {
         dcp_filecreator: 717170000, // Applicant
         dcp_filecategory: 717170006, // Other
         dcp_visibility: 717170002, // Applicant Only
-        '[email protected]': `/dcp_filetypes(${'letter'})`,
+        '[email protected]': `/dcp_filetypes(${this.letterFiletypeUuid})`,
         ...(projectId
           ? { '[email protected]': `/dcp_projects(${projectId})` }
           : {}),
-      });
-      console.debug('new artifact in artifact service', newArtifact);
-
+        });
     } catch (e) {
       throw new HttpException(
         {

server/src/projects/projects.controller.ts

@@ -26,7 +26,6 @@ import { PROJECTAPPLICANT_ATTRS } from './project-applicants/project-applicants.
 import { TEAMMEMBER_ATTRS } from './team-members/team-members.attrs';
 import { CONTACT_ATTRS } from '../contact/contacts.attrs';
 import { INVOICE_ATTRS } from '../invoices/invoices.attrs';
-import { ArtifactService } from '../artifacts/artifacts.service';
 
 @UseInterceptors(
   new JsonApiSerializeInterceptor('projects', {
@@ -39,6 +38,7 @@ import { ArtifactService } from '../artifacts/artifacts.service';
       'team-members',
       'contacts',
       'milestones',
+      'dcp_artifactsid',
     ],
     packages: {
       ref: 'dcp_packageid',
@@ -89,7 +89,6 @@ export class ProjectsController {
     private readonly contactService: ContactService,
     private readonly config: ConfigService,
     private readonly crmService: CrmService,
-    private readonly artifactService: ArtifactService,
   ) {
     this.CRM_IMPOSTER_ID = this.config.get('CRM_IMPOSTER_ID');
   }
@@ -151,22 +150,7 @@ export class ProjectsController {
       );
     }
 
-    let firstArtifactWithDocuments = {};
-    const newProject = await this.projectsService.create(allowedAttrs);
-    console.log(
-      `project id in projects controller: ${newProject.dcp_projectid}`,
-    );
-    try {
-      firstArtifactWithDocuments =
-        await this.artifactService.createProjectInitiationArtifacts(
-          newProject.dcp_projectid,
-        );
-        console.log('** create Project Artifacts', firstArtifactWithDocuments);
-    } catch (e) {
-      console.log('firstArtifactWithDocuments error in projects controller', e);
-    }
-
-    return newProject;
+    return await this.projectsService.create(allowedAttrs);
   }
 
   @Get('/:id')

server/src/projects/projects.service.ts

@@ -4,6 +4,7 @@ import { NycidService } from '../contact/nycid/nycid.service';
 import { CrmService } from '../crm/crm.service';
 import { overwriteCodesWithLabels } from '../_utils/overwrite-codes-with-labels';
 import { MILESTONE_ATTRS, MILESTONE_NON_DATE_ATTRS } from './projects.attrs';
+import { ArtifactService } from '../artifacts/artifacts.service';
 
 const APPLICANT_ACTIVE_STATUS_CODE = 1;
 const PROJECT_ACTIVE_STATE_CODE = 0;
@@ -52,6 +53,7 @@ export class ProjectsService {
   constructor(
     private readonly crmService: CrmService,
     private readonly nycidService: NycidService,
+    private readonly artifactService: ArtifactService,
   ) {}
 
   public async findManyByContactId(contactId: string) {
@@ -122,8 +124,14 @@ export class ProjectsService {
         'dcp_projects',
         data,
       );
+      const { dcp_artifactsid } =
+        await this.artifactService.createProjectInitiationArtifacts(
+          dcp_projectid,
+        );
+
       return {
         dcp_projectid,
+        dcp_artifactsid,
       };
     } catch (e) {
       console.debug('error creating project', e);