Main temp

.docker/firebase-emulators/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16-slim
+FROM node:18-slim
 ARG BUILD_DATE
 ARG FIREBASE_TOOLS_VERSION
 ARG HOME

.docker/init.sql

@@ -2,4 +2,4 @@ SELECT 'CREATE DATABASE "involvemint"'
 WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = 'involvemint')\gexec
 
 SELECT 'CREATE DATABASE "involvemint-e2e"'
-WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = 'involvemint-e2e')\gexec
+WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = 'involvemint-e2e')\gexec

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+    // 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": [
+        {
+            "name": "Launch Chrome",
+            "request": "launch",
+            "type": "chrome",
+            "url": "http://localhost:4202/",
+            "webRoot": "${workspaceFolder}"
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Debug Program",
+            "skipFiles": ["<node_internals>/**"],
+            "env": {
+                "NODE_OPTIONS": "--openssl-legacy-provider",
+                "FIREBASE_STORAGE_EMULATOR_HOST": "localhost:9199",
+                "FIRESTORE_EMULATOR_HOST": "localhost:8080"
+            },
+            "preLaunchTask": "npm: build:server:local",
+            "program": "${workspaceFolder}/dist/apps/api/main.js",
+            "console": "integratedTerminal"
+        }
+    ]
+}

README.md

@@ -24,8 +24,8 @@ Run the following commands.
 3. `[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"`
 4. Refresh your shell (close and reopen). If you're using zsh, here's a shortcut: `source ~/.zshrc`
 5. If the following command does not throw an error, you're good so far: `nvm -v`
-6. `nvm install lts/gallium`
-7. `nvm use lts/gallium`
+6. `nvm install lts/jod`
+7. `nvm use lts/jod`
 
 ### Configuring Firebase
 
@@ -127,13 +127,15 @@ If you are prompted for the pasword (below screenshot) when opening PgAdmin at h
 
 ### Starting the Apps
 
-- Open a terminal and run `npm i` from root directory to install all the required packages. 
-- Run `export FIREBASE_STORAGE_EMULATOR_HOST=localhost:9199`. 
-- Run `export FIRESTORE_EMULATOR_HOST='localhost:8080'`. 
+- Open a terminal and run `npm i` from root directory to install all the required packages.
+- Run `export FIREBASE_STORAGE_EMULATOR_HOST=localhost:9199`.
+- Run `export FIRESTORE_EMULATOR_HOST='localhost:8080'`.
+- Run `export NODE_OPTIONS=--openssl-legacy-provider` because otherwise there will be an error with OpenSSL.
 - Run `npm run start:client:local` which will start the client app.
 - Leave that terminal open and running and open a new terminal
-- In the new terminal: Run `export FIREBASE_STORAGE_EMULATOR_HOST=localhost:9199`. 
-- In the new terminal: Run `export FIRESTORE_EMULATOR_HOST='localhost:8080'`. 
+- In the new terminal: Run `export FIREBASE_STORAGE_EMULATOR_HOST=localhost:9199`.
+- In the new terminal: Run `export FIRESTORE_EMULATOR_HOST='localhost:8080'`.
+- In the new terminal: Run `export NODE_OPTIONS=--openssl-legacy-provider`.
 - Then Run `npm run start:server:local` which will start the server app.
 
 Once running, the client can be accessed via `http://localhost:4202` and the api/server will be running on `http://127.0.0.1:3335`

angular.json

@@ -50,7 +50,7 @@
               "fileReplacements": [
                 {
                   "replace": "libs/shared/domain/src/lib/environments/environment.ts",
-                  "with": "libs/shared/domain/src/lib/environments/environment.prod.ts"
+                  "with": "libs/shared/domain/src/lib/environments/environment.prod.ui.ts"
                 }
               ],
               "optimization": true,
@@ -77,7 +77,7 @@
               "fileReplacements": [
                 {
                   "replace": "libs/shared/domain/src/lib/environments/environment.ts",
-                  "with": "libs/shared/domain/src/lib/environments/environment.test.ts"
+                  "with": "libs/shared/domain/src/lib/environments/environment.test.ui.ts"
                 }
               ],
               "optimization": true,
@@ -205,7 +205,7 @@
               "fileReplacements": [
                 {
                   "replace": "libs/shared/domain/src/lib/environments/environment.ts",
-                  "with": "libs/shared/domain/src/lib/environments/environment.prod.ts"
+                  "with": "libs/shared/domain/src/lib/environments/environment.prod.api.ts"
                 }
               ]
             },
@@ -216,7 +216,7 @@
               "fileReplacements": [
                 {
                   "replace": "libs/shared/domain/src/lib/environments/environment.ts",
-                  "with": "libs/shared/domain/src/lib/environments/environment.test.ts"
+                  "with": "libs/shared/domain/src/lib/environments/environment.test.api.ts"
                 }
               ]
             },
@@ -814,22 +814,22 @@
         }
       }
     },
-    "server-orcha": {
-      "root": "libs/server/orcha",
-      "sourceRoot": "libs/server/orcha/src",
+    "server-api": {
+      "root": "libs/server/api",
+      "sourceRoot": "libs/server/api/src",
       "projectType": "library",
       "architect": {
         "lint": {
           "builder": "@nrwl/linter:eslint",
           "options": {
-            "lintFilePatterns": ["libs/server/orcha/**/*.ts"]
+            "lintFilePatterns": ["libs/server/api/**/*.ts"]
           }
         },
         "test": {
           "builder": "@nrwl/jest:jest",
-          "outputs": ["coverage/libs/server/orcha"],
+          "outputs": ["coverage/libs/server/api"],
           "options": {
-            "jestConfig": "libs/server/orcha/jest.config.js",
+            "jestConfig": "libs/server/api/jest.config.js",
             "passWithNoTests": true
           }
         }
@@ -858,7 +858,7 @@
               "fileReplacements": [
                 {
                   "replace": "apps/migrate/src/environments/environment.ts",
-                  "with": "apps/migrate/src/environments/environment.prod.ts"
+                  "with": "apps/migrate/src/environments/environment.prod.api.ts"
                 }
               ]
             },
@@ -869,7 +869,7 @@
               "fileReplacements": [
                 {
                   "replace": "apps/migrate/src/environments/environment.ts",
-                  "with": "apps/migrate/src/environments/environment.test.ts"
+                  "with": "apps/migrate/src/environments/environment.test.api.ts"
                 }
               ]
             }

apps/api-e2e/src/core/app-test.module.ts

@@ -1,4 +1,4 @@
-import { ServerOrchaModule } from '@involvemint/server/orcha';
+import { ServerAPIModule } from '@involvemint/server/api';
 import { Module } from '@nestjs/common';
 import { ScheduleModule } from '@nestjs/schedule';
 import { TypeOrmModule } from '@nestjs/typeorm';
@@ -14,7 +14,7 @@ patchTypeORMRepositoryWithBaseRepository();
 
 @Module({
   imports: [
-    ServerOrchaModule,
+    ServerAPIModule,
     TypeOrmModule.forRoot({
       type: 'postgres',
       host: '127.0.0.1',
@@ -29,4 +29,4 @@ patchTypeORMRepositoryWithBaseRepository();
     ScheduleModule.forRoot(),
   ],
 })
-export class AppTestModule {}
+export class AppTestModule {}

apps/api-e2e/src/specs/change-maker/change-maker-e2e.spec.ts

@@ -1,26 +1,22 @@
+
 import { ChangeMakerRepository } from '@involvemint/server/core/domain-services';
-import { ChangeMaker, IChangeMakerOrchestration, IUserOrchestration, User } from '@involvemint/shared/domain';
+import { ChangeMaker, DTO_KEY, EditCmProfileDto, QUERY_KEY, TOKEN_KEY, User } from '@involvemint/shared/domain';
 import { HttpStatus } from '@nestjs/common';
-import { NestFastifyApplication } from '@nestjs/platform-fastify';
 import { Test } from '@nestjs/testing';
-import { createQuery, IParser } from '@orcha/common';
-import { ITestOrchestration } from '@orcha/testing';
+import supertest from 'supertest';
+import { INestApplication } from '@nestjs/common';
+import { createQuery, IParser } from '@involvemint/shared/domain';
 import { AppTestModule } from '../../core/app-test.module';
 import { DatabaseService } from '../../core/database.service';
-import { createUserOrchestration } from '../user/user.orchestration';
-import { createChangeMakerOrchestration } from './change-maker.orchestration';
 
-describe('ChangeMaker Orchestration Integration Tests', () => {
-  let app: NestFastifyApplication;
+describe('ChangeMaker Integration Tests', () => {
+  let app: INestApplication;
   let db: DatabaseService;
 
-  let userOrcha: ITestOrchestration<IUserOrchestration>;
-  let cmOrcha: ITestOrchestration<IChangeMakerOrchestration>;
-
   let cmRepo: ChangeMakerRepository;
 
   const creds = { id: '[email protected]', password: 'GoodPwd@341' };
-  let auth: { body: { token: string }; statusCode: HttpStatus };
+  let token: string;
 
   const cmQuery = createQuery<ChangeMaker>()({ id: true, firstName: true, handle: { id: true } });
   let cmProfile: IParser<ChangeMaker, typeof cmQuery>;
@@ -36,53 +32,105 @@ describe('ChangeMaker Orchestration Integration Tests', () => {
     app = moduleRef.createNestApplication();
     db = moduleRef.get(DatabaseService);
 
-    userOrcha = createUserOrchestration(app);
-    cmOrcha = createChangeMakerOrchestration(app);
-
     cmRepo = moduleRef.get(ChangeMakerRepository);
 
     await app.init();
   });
 
   beforeEach(async () => {
     await db.clearDb();
-    auth = await userOrcha.signUp({ token: true }, '', creds);
-    const { body, statusCode } = await cmOrcha.createProfile(cmQuery, auth.body.token, {
-      handle: 'bobby',
-      firstName: 'fn',
-      lastName: 'ln',
-      phone: '(555) 555-5555',
+    const signUpResult = await supertest(app.getHttpServer())
+      .post('/user/signUp')
+      .send({
+        [QUERY_KEY]: { [TOKEN_KEY]: true },
+        [DTO_KEY]: creds,
+      });
+    token = signUpResult.body[TOKEN_KEY];
+    const profileCreationResult = await supertest(app.getHttpServer())
+    .post('/changeMaker/createProfile')
+    .set('token', token)
+    .set('Content-Type', 'application/json')
+    .set('Accept', 'application/json')
+    .send({
+      [QUERY_KEY]: cmQuery,
+      [DTO_KEY]: {
+        handle: 'bobby',
+        firstName: 'fn',
+        lastName: 'ln',
+        phone: '(555) 555-5555',
+      }
     });
-    cmProfile = body;
-    expect(statusCode).toBe(HttpStatus.CREATED);
+
+    cmProfile = profileCreationResult.body as IParser<ChangeMaker, typeof cmQuery>;
+    expect(profileCreationResult.statusCode).toBe(HttpStatus.CREATED);
   });
 
   afterAll(async () => await app.close());
 
   describe('createProfile', () => {
     it('should create profile', async () => {
-      const res = await userOrcha.getUserData(userQuery, auth.body.token);
+      const getUserData = await supertest(app.getHttpServer())
+        .post('/user/getUserData')
+        .set(TOKEN_KEY, token)
+        .send({
+          [QUERY_KEY]: userQuery
+        });
+
       const cmEntity = await cmRepo.findOneOrFail(cmProfile.id, cmQuery);
-      expect(res.body.changeMaker).toMatchObject(cmEntity);
+      expect(getUserData.body.changeMaker).toMatchObject(cmEntity);
+
     });
 
     it('should verify handle uniqueness', async () => {
-      const { error } = await cmOrcha.createProfile(cmQuery, auth.body.token, {
-        firstName: 'Bobby',
-        lastName: 'Smith',
-        handle: 'bobby',
-        phone: '(412) 232-2953',
+
+      const profileCreationResult = await supertest(app.getHttpServer())
+      .post('/changeMaker/createProfile')
+      .set('token', token)
+      .set('Content-Type', 'application/json')
+      .set('Accept', 'application/json')
+      .send({
+        [QUERY_KEY]: cmQuery,
+        [DTO_KEY]: {
+          firstName: 'Bobby',
+          lastName: 'Smith',
+          handle: 'bobby',
+          phone: '(412) 232-2953',
+        }
       });
-      expect(error).toBe(`Handle @bobby already exists.`);
+
+      if(profileCreationResult.error !== false)
+      {
+        expect(JSON.parse(profileCreationResult.error.text).message).toBe(`Handle @bobby already exists.`);
+      }
+
     });
   });
 
   describe('editProfile', () => {
     it('should edit profile', async () => {
       const firstName = 'Jessie';
-      await cmOrcha.editProfile(cmQuery, auth.body.token, { firstName });
-      const res = await userOrcha.getUserData(userQuery, auth.body.token);
-      expect(res.body.changeMaker?.firstName).toBe(firstName);
+
+      const editProfileArgument: EditCmProfileDto = {
+        firstName: 'Jessie'
+      }
+      await supertest(app.getHttpServer())
+      .post('/changeMaker/editProfile')
+      .set('token', token)
+      .set('Content-Type', 'application/json')
+      .set('Accept', 'application/json')
+      .send({
+        [QUERY_KEY]: cmQuery,
+        [DTO_KEY]: editProfileArgument
+      });
+
+      const getUserDataResponse = await supertest(app.getHttpServer())
+      .post('/user/getUserData')
+      .set(TOKEN_KEY, token)
+      .send({
+        [QUERY_KEY]: userQuery
+      });
+
+      expect(getUserDataResponse.body.changeMaker?.firstName).toBe(firstName);
     });
   });
 });