fix: development branch merge conflict resolution

Author: alex-struk

.github/workflows/ci.yml

@@ -39,6 +39,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
+        with:
+          node-version: "16"
+          cache: "yarn"
       - run: yarn
       - run: pip install pre-commit
       - run: pre-commit run --all-files -v

.gitignore

@@ -39,3 +39,6 @@ yarn-error.log
 
 # TypeScript
 tsconfig.tsbuildinfo
+
+.specstory/
+.cursor/

README.md

@@ -209,6 +209,7 @@ npm run <SCRIPT_NAME>
 | `back-end:start`                        | Starts the back-end server (assumes it has already been built by grunt).                                                                                                                                         |
 | `back-end:build`                        | Builds the back-end server using grunt.                                                                                                                                                                          |
 | `back-end:watch`                        | Builds and starts the back-end server inside a nodemon process, rebuilding and restarting it whenever a back-end or shared source file changes.                                                                  |
+| `back-end:debug-watch`                  | Similar to back-end:debug but generates source maps to enable IDE debugging of the API project
 | `back-end:typedoc`                      | Builds TypeDoc API documentation for the back-end source code.                                                                                                                                                   |
 | `shared:lint`                           | Lints the shared source code using eslint.                                                                                                                                                                       |
 | `shared:typedoc`                        | Builds TypeDoc API documentation for the shared source code.                                                                                                                                                     |
@@ -411,4 +412,4 @@ The Digital Marketplace is currently operated by the Procurement Services Branch
 
 ## Credits
 
-This project would not have been possible by the incredible work done by open source project maintainers. The licenses for open source projects used by the Procurement Concierge Program's web app are documented in `docs/open-source-licenses.txt`.
+This project would not have been possible by the incredible work done by open source project maintainers. The licenses for open source projects used are documented in `docs/open-source-licenses.txt`.

docs/local-development/debug-config.md

@@ -81,11 +81,16 @@ Debugging the front-end might require evaluating MSG's in the state object.
 - running locally
 - command line access
 
-1. Run the following:
-`NODE_ENV=development npm run back-end:watch`
+### Regular Development (without source maps)
 
+Run the following for normal development:
+```bash
+NODE_ENV=development npm run back-end:watch
+```
+
+This will display server logs:
 
-``` bash
+```bash
 [request:76d1029e-445a-46b1-a45b-db34cdefbac4] -> GET /images/illustrations/sprint_with_us.svg sessionId="anonymous"
 [request:76d1029e-445a-46b1-a45b-db34cdefbac4] <- 200 1ms
 [request:b7c10e3f-5bd9-49f7-a82f-3d4d21e2b042] -> GET /images/illustrations/collaboration_work.svg sessionId="anonymous"
@@ -99,3 +104,11 @@ Debugging the front-end might require evaluating MSG's in the state object.
 [hooks] Invoked cwuCrudHook at Thu Nov 24 2022 16:02:55 GMT-0800 (Pacific Standard Time)
 [hooks] Invoked swuCrudHook at Thu Nov 24 2022 16:02:55 GMT-0800 (Pacific Standard Time)
 ```
+
+### Debugging with Source Maps
+
+For debugging with IDE integration and source maps, use the following:
+
+In your IDE, set up a debug configuration that connects to your Node.js application. For VS Code You can use the pre-configured 'Run Script:back-end:debug' command, which will automatically start and attach to the debug session. This allows you to set breakpoints, inspect variables, and step through your back-end code.
+
+This setup uses a separate `tsconfig.debug.json` configuration that only generates source maps when needed for debugging.

docs/onboarding.md

@@ -176,7 +176,7 @@ To watch for source file changes and rebuild the back-end during local developme
 | `src/back-end/lib/hooks/code-with-us.ts`    | A hook that automatically marks Code With Us opportunities as ready for evaluation. This hook is run on a per-request basis and is throttled to limit resource utilization.                                           |
 | `src/back-end/lib/hooks/logger.ts`          | A hook that logs each request and response.                                                                                                                                                                           |
 | `src/back-end/lib/hooks/sprint-with-us.ts`  | A hook that automatically marks Sprint With Us opportunities as ready for evaluation. This hook is run on a per-request basis and is throttled to limit resource utilization.                                         |
-| `src/back-end/lib/mailer/notifications/`    | Modules that export individual email notifications.                                                                                                                                                                   |
+| `src/back-end/lib/mailer/notifications/`    | Modules that export individual email notifications. **Note:** There is a discrepancy in how contract dates are displayed in opportunity award emails across the three opportunity types. CWU opportunities have `startDate` and `completionDate` fields but do not include them in award emails, while TWU opportunities include them.                                                                                |
 | `src/back-end/lib/mailer/index.tsx`         | Exports general types for representing transactional emails.                                                                                                                                                          |
 | `src/back-end/lib/mailer/templates.tsx`     | Exports types, functions and React views for rendering email notifications.                                                                                                                                           |
 | `src/back-end/lib/mailer/transport.ts`      | Exports types and functions for sending transactional emails using `nodemailer`.                                                                                                                                      |

package.json

@@ -27,6 +27,7 @@
     "back-end:start": "node build/back-end/back-end/start.js",
     "back-end:build": "npx grunt back-end-build",
     "back-end:watch": "npx nodemon --watch ./src/back-end --watch ./src/shared --ext ts,tsx,js,json,yaml --exec \"npx grunt back-end-build-development && npm run back-end:start\"",
+    "back-end:debug-watch": "npx nodemon --watch ./src/back-end --watch ./src/shared --ext ts,tsx,js,json,yaml --exec \"npx tsc --project src/back-end/tsconfig.debug.json --outDir build/back-end && npm run back-end:start\"",
     "back-end:typedoc": "npx typedoc --name 'Digital Marketplace Back-End' --tsconfig src/back-end/tsconfig.json --cleanOutputDir --out typedoc/back-end --excludeExternals --entryPointStrategy expand src/back-end",
     "shared:lint": "npx eslint -c .eslintrc.js src/shared && echo Lint Successful\n",
     "shared:typedoc": "npx typedoc --name 'Digital Marketplace Shared' --tsconfig src/shared/tsconfig.json --cleanOutputDir --out typedoc/shared --excludeExternals --entryPointStrategy expand src/shared",

src/back-end/config.ts

@@ -8,9 +8,9 @@ import { parseBooleanEnvironmentVariable } from "shared/config";
 
 // HARDCODED CONFIG
 // Offset for total opportunity metrics displayed on landing page
-export const TOTAL_AWARDED_COUNT_OFFSET = 94;
+export const TOTAL_AWARDED_COUNT_OFFSET = 93;
 
-export const TOTAL_AWARDED_VALUE_OFFSET = 13211500;
+export const TOTAL_AWARDED_VALUE_OFFSET = 13736500;
 
 export const DB_MIGRATIONS_TABLE_NAME = "migrations";
 

src/back-end/index.ts

@@ -41,6 +41,14 @@ import sessionResource from "back-end/lib/resources/session";
 import codeWithUsSubscriberResource from "back-end/lib/resources/subscribers/code-with-us";
 import sprintWithUsSubscriberResource from "back-end/lib/resources/subscribers/sprint-with-us";
 import teamWithUsSubscriberResource from "back-end/lib/resources/subscribers/team-with-us";
+import sprintWithUsProposalTeamQuestionEvaluationResource from "back-end/lib/resources/proposal/sprint-with-us/team-questions/evaluations";
+import sprintWithUsOpportunityTeamQuestionEvaluationResource from "back-end/lib/resources/opportunity/sprint-with-us/team-questions/evaluations";
+import sprintWithUsProposalTeamQuestionConsensusResource from "back-end/lib/resources/proposal/sprint-with-us/team-questions/consensus";
+import sprintWithUsOpportunityTeamQuestionConsensusResource from "back-end/lib/resources/opportunity/sprint-with-us/team-questions/consensus";
+import teamWithUsProposalResourceQuestionEvaluationResource from "back-end/lib/resources/proposal/team-with-us/resource-questions/evaluations";
+import teamWithUsOpportunityResourceQuestionEvaluationResource from "back-end/lib/resources/opportunity/team-with-us/resource-questions/evaluations";
+import teamWithUsProposalResourceQuestionConsensusResource from "back-end/lib/resources/proposal/team-with-us/resource-questions/consensus";
+import teamWithUsOpportunityResourceQuestionConsensusResource from "back-end/lib/resources/opportunity/team-with-us/resource-questions/consensus";
 import userResource from "back-end/lib/resources/user";
 import adminRouter from "back-end/lib/routers/admin";
 import authRouter from "back-end/lib/routers/auth";
@@ -160,7 +168,15 @@ export function createRouter(connection: Connection): AppRouter {
     sessionResource,
     userResource,
     metricsResource,
-    emailNotificationsResource
+    emailNotificationsResource,
+    sprintWithUsProposalTeamQuestionEvaluationResource,
+    sprintWithUsOpportunityTeamQuestionEvaluationResource,
+    sprintWithUsProposalTeamQuestionConsensusResource,
+    sprintWithUsOpportunityTeamQuestionConsensusResource,
+    teamWithUsProposalResourceQuestionEvaluationResource,
+    teamWithUsOpportunityResourceQuestionEvaluationResource,
+    teamWithUsProposalResourceQuestionConsensusResource,
+    teamWithUsOpportunityResourceQuestionConsensusResource
   ];
 
   // Define CRUD routes.