Merge pull request #468 from bcgov/development

multiple twu resources

src/back-end/lib/db/proposal/team-with-us.ts

@@ -149,6 +149,14 @@ async function rawHistoryRecordToHistoryRecord(
  };
 }
 
+/**
+ * "raw" indicates reading data from the db and modifying the data to conform
+ * to type declarations in the application. In this case, the db holds a memberID
+ * which is then used to get a username 'idpUsername'.
+ *
+ * @param connection
+ * @param raw
+ */
 async function rawProposalTeamMemberToProposalTeamMember(
  connection: Connection,
  raw: RawProposalTeamMember
@@ -643,7 +651,7 @@ const readTWUProposalMembers = tryDb<[Id], RawProposalTeamMember[]>(
  proposalId
  );
 
- query.select<RawProposalTeamMember[]>("member", "hourlyRate");
+ query.select<RawProposalTeamMember[]>("member", "hourlyRate", "resource");
 
  const results = await query;
 
@@ -856,7 +864,8 @@ async function createTWUProposalTeamMembers(
  {
  proposal: proposalId,
  member: teamMember.member,
- hourlyRate: teamMember.hourlyRate
+ hourlyRate: teamMember.hourlyRate,
+ resource: teamMember.resource
  },
  "*"
  );
@@ -1255,14 +1264,21 @@ async function calculatePriceScore(
  "=",
  "members.proposal"
  )
+ .join("twuResources as resources", "members.resource", "=", "resources.id")
  .whereIn("proposals.opportunity", function () {
  this.where({ id: proposalId }).select("opportunity").from("twuProposals");
  })
  .whereIn("statuses.status", [
  TWUProposalStatus.UnderReviewChallenge,
  TWUProposalStatus.EvaluatedChallenge
  ])
- .sum("members.hourlyRate as bid")
+ // multiple resources requires matching the hourly rate of the team member
+ // with the targetAllocation for the opportunity
+ .select(
+ connection.raw(
+ 'SUM(members."hourlyRate" * resources."targetAllocation" / 100) AS bid'
+ )
+ )
  .groupBy("proposals.id")
  .select<ProposalBidRecord[]>("proposals.id")
  .orderBy("bid", "asc");

src/back-end/lib/db/service-area.ts

@@ -5,7 +5,15 @@ import {
  TWUServiceAreaRecord
 } from "shared/lib/resources/service-area";
 import { Id } from "shared/lib/types";
+import { TWUServiceArea } from "shared/lib/resources/opportunity/team-with-us";
 
+/**
+ * Reads a service area from the database, returns a number (id) if given a string value (enum)
+ *
+ * @param connection
+ * @param serviceArea - the enum value
+ * @returns ServiceAreaId - the id value of the service area in the database
+ */
 export const readOneServiceAreaByServiceArea = tryDb<
  [Id],
  ServiceAreaId | null
@@ -15,3 +23,20 @@ export const readOneServiceAreaByServiceArea = tryDb<
  .first();
  return valid(result ? result.id : null);
 });
+
+/**
+ * Reads a service area from the database, returns a service area (enum) if given a number (id) value
+ *
+ * @param connection
+ * @param id - serviceAreaId
+ * @returns TWUServiceArea - the enum value
+ */
+export const readOneServiceAreaByServiceAreaId = tryDb<
+ [ServiceAreaId],
+ TWUServiceArea | null
+>(async (connection, id) => {
+ const result = await connection<TWUServiceAreaRecord>("serviceAreas")
+ .where({ id })
+ .first();
+ return valid(result ? result.serviceArea : null);
+});

src/back-end/lib/mailer/notifications/affiliation.tsx

@@ -87,8 +87,8 @@ export async function addedToTeamT(affiliation: Affiliation): Promise<Emails> {
  </p>
  <p>
  If you approve the membership, you can be included as a team
- member on future Sprint With Us proposals submitted by{" "}
- {organization.legalName}.
+ member on future Sprint With Us or Team With Us proposals
+ submitted by {organization.legalName}.
  </p>
  </div>
  ),
@@ -124,7 +124,8 @@ export async function approvedRequestToJoinT(
  </p>
  <p>
  {memberName} can now be included in proposals submitted by{" "}
- {organizationName} to Sprint With Us opportunities.
+ {organizationName} to Sprint With Us or Team With Us
+ opportunities.
  </p>
  </div>
  ),
@@ -184,7 +185,7 @@ export async function membershipCompleteT(
  </p>
  <p>
  {organizationName} can now include you on proposals to Sprint With
- Us opportunities.
+ Us or Team With Us opportunities.
  </p>
  </div>
  ),
@@ -214,7 +215,8 @@ export async function memberLeavesT(
  <p>
  {memberName} has left {organizationName}
  {"'"}s team on the Digital Marketplace. They will no longer be
- able to be included on proposals for Sprint With Us opportunities.
+ able to be included on proposals for Sprint With Us or Team With
+ Us opportunities.
  </p>
  </div>
  ),

src/back-end/lib/mailer/notifications/opportunity/team-with-us.tsx

@@ -190,13 +190,14 @@ export function makeTWUOpportunityInformation(
  opportunity: TWUOpportunity,
  showDueDate = true
 ): templates.DescriptionListProps {
+ const serviceAreas = opportunity.resources.map((resource, index) => ({
+ name: "Service Area ".concat(`${index + 1}`),
+ value: `${startCase(lowerCase(resource.serviceArea))}`
+ }));
  const items = [
  { name: "Type", value: "Team With Us" },
  { name: "Value", value: `$${formatAmount(opportunity.maxBudget)}` },
- {
- name: "Service Area",
- value: `${startCase(lowerCase(opportunity.serviceArea))}`
- },
+ ...serviceAreas,
  {
  name: "Contract Start Date",
  value: formatDate(opportunity.startDate, false)

src/back-end/lib/mailer/notifications/user.tsx

@@ -52,7 +52,7 @@ export async function inviteToRegisterT(
  />{" "}
  for a Digital Marketplace account. Once you have signed up, you
  can join their team and be included in proposals to Sprint With Us
- opportunities.
+ or Team With Us opportunities.
  </p>
  </div>
  ),

src/back-end/lib/resources/opportunity/sprint-with-us.ts

@@ -488,7 +488,7 @@ const create: crud.Create<
  const validatedMandatorySkills =
  genericValidation.validateMandatorySkills(mandatorySkills);
  const validatedOptionalSkills =
- opportunityValidation.validateOptionalSkills(optionalSkills);
+ genericValidation.validateOptionalSkills(optionalSkills);
  const validatedDescription =
  genericValidation.validateDescription(description);
  const validatedQuestionsWeight =
@@ -1077,7 +1077,7 @@ const update: crud.Update<
  const validatedMandatorySkills =
  genericValidation.validateMandatorySkills(mandatorySkills);
  const validatedOptionalSkills =
- opportunityValidation.validateOptionalSkills(optionalSkills);
+ genericValidation.validateOptionalSkills(optionalSkills);
  const validatedDescription =
  genericValidation.validateDescription(description);
  const validatedQuestionsWeight =
@@ -1295,7 +1295,7 @@ const update: crud.Update<
  genericValidation.validateMandatorySkills(
  validatedSWUOpportunity.value.mandatorySkills
  ),
- opportunityValidation.validateOptionalSkills(
+ genericValidation.validateOptionalSkills(
  validatedSWUOpportunity.value.optionalSkills
  ),
  genericValidation.validateDescription(