`
+ )
+ expect(emailMock.html).toMatch("Hello,")
+ expect(emailMock.html).toMatch("Listing approval requested")
+ expect(emailMock.html).toMatch(
+ `A Partner has submitted an approval request to publish the ${listing.name} listing.`
+ )
+ expect(emailMock.html).toMatch("Please log into the")
+ expect(emailMock.html).toMatch("Partners Portal")
+ expect(emailMock.html).toMatch(/http:\/\/localhost:3001/)
+ expect(emailMock.html).toMatch(
+ "and navigate to the listing detail page to review and publish."
+ )
+ expect(emailMock.html).toMatch(
+ "To access the listing after logging in, please click the link below"
+ )
+ expect(emailMock.html).toMatch("Review Listing")
+ expect(emailMock.html).toMatch(/http:\/\/localhost:3001\/listings\/Uvbk5qurpB2WI9V6WnNdH/)
+ expect(emailMock.html).toMatch("Thank you,")
+ expect(emailMock.html).toMatch("Alameda County Housing Portal")
+ expect(emailMock.html).toMatch("Alameda County Housing Portal is a project of the")
+ expect(emailMock.html).toMatch(
+ "Alameda County - Housing and Community Development (HCD) Department"
+ )
+ })
+ })
+
+ describe("changes requested", () => {
+ it("should generate html body", async () => {
+ const emailArr = ["testOne@xample.com", "testTwo@example.com"]
+ const service = await module.resolve(EmailService)
+ await service.changesRequested(
+ user,
+ { id: listing.id, name: listing.name },
+ emailArr,
+ "http://localhost:3001"
+ )
+
+ expect(sendMock).toHaveBeenCalled()
+ const emailMock = sendMock.mock.calls[0][0]
+ expect(emailMock.to).toEqual(emailArr)
+ expect(emailMock.subject).toEqual("Listing changes requested")
+ expect(emailMock.html).toMatch(
+ ``
+ )
+ expect(emailMock.html).toMatch("Listing changes requested")
+ expect(emailMock.html).toMatch("Hello,")
+ expect(emailMock.html).toMatch(
+ `An administrator is requesting changes to the ${listing.name} listing. Please log into the `
+ )
+ expect(emailMock.html).toMatch("Partners Portal")
+ expect(emailMock.html).toMatch(/http:\/\/localhost:3001/)
+
+ expect(emailMock.html).toMatch(
+ " and navigate to the listing detail page to view the request and edit the listing."
+ )
+ expect(emailMock.html).toMatch(
+ "and navigate to the listing detail page to view the request and edit the listing."
+ )
+ expect(emailMock.html).toMatch(/http:\/\/localhost:3001/)
+ expect(emailMock.html).toMatch(
+ "To access the listing after logging in, please click the link below"
+ )
+ expect(emailMock.html).toMatch("Edit Listing")
+ expect(emailMock.html).toMatch(/http:\/\/localhost:3001\/listings\/Uvbk5qurpB2WI9V6WnNdH/)
+ expect(emailMock.html).toMatch("Thank you,")
+ expect(emailMock.html).toMatch("Alameda County Housing Portal")
+ expect(emailMock.html).toMatch("Alameda County Housing Portal is a project of the")
+ expect(emailMock.html).toMatch(
+ "Alameda County - Housing and Community Development (HCD) Department"
+ )
+ })
+ })
+
+ describe("published listing", () => {
+ it("should generate html body", async () => {
+ const emailArr = ["testOne@xample.com", "testTwo@example.com"]
+ const service = await module.resolve(EmailService)
+ await service.listingApproved(
+ user,
+ { id: listing.id, name: listing.name },
+ emailArr,
+ "http://localhost:3000"
+ )
+
+ expect(sendMock).toHaveBeenCalled()
+ const emailMock = sendMock.mock.calls[0][0]
+ expect(emailMock.to).toEqual(emailArr)
+ expect(emailMock.subject).toEqual("New published listing")
+ expect(emailMock.html).toMatch(
+ ``
+ )
+ expect(emailMock.html).toMatch("New published listing")
+ expect(emailMock.html).toMatch("Hello,")
+ expect(emailMock.html).toMatch(
+ `The ${listing.name} listing has been approved and published by an administrator.`
+ )
+ expect(emailMock.html).toMatch(
+ "To view the published listing, please click on the link below"
+ )
+ expect(emailMock.html).toMatch("View Listing")
+ expect(emailMock.html).toMatch(/http:\/\/localhost:3000\/listing\/Uvbk5qurpB2WI9V6WnNdH/)
+ expect(emailMock.html).toMatch("Thank you,")
+ expect(emailMock.html).toMatch("Alameda County Housing Portal")
+ expect(emailMock.html).toMatch("Alameda County Housing Portal is a project of the")
+ expect(emailMock.html).toMatch(
+ "Alameda County - Housing and Community Development (HCD) Department"
+ )
+ })
+ })
afterAll(async () => {
await module.close()
diff --git a/backend/core/src/email/email.service.ts b/backend/core/src/email/email.service.ts
index 4a5bd9c640..39553fbbd0 100644
--- a/backend/core/src/email/email.service.ts
+++ b/backend/core/src/email/email.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, Logger, Scope } from "@nestjs/common"
+import { HttpException, Injectable, Logger, Scope } from "@nestjs/common"
import { SendGridService } from "@anchan828/nest-sendgrid"
import { ResponseError } from "@sendgrid/helpers/classes"
import merge from "lodash/merge"
@@ -17,6 +17,7 @@ import { Jurisdiction } from "../jurisdictions/entities/jurisdiction.entity"
import { Language } from "../shared/types/language-enum"
import { JurisdictionsService } from "../jurisdictions/services/jurisdictions.service"
import { Translation } from "../translations/entities/translation.entity"
+import { IdName } from "../../types"
@Injectable({ scope: Scope.REQUEST })
export class EmailService {
@@ -287,26 +288,36 @@ export class EmailService {
return partials
}
- private async send(to: string, from: string, subject: string, body: string, retry = 3) {
- await this.sendGrid.send(
- {
- to: to,
- from,
- subject: subject,
- html: body,
- },
- false,
- (error) => {
- if (error instanceof ResponseError) {
- const { response } = error
- const { body: errBody } = response
- console.error(`Error sending email to: ${to}! Error body: ${errBody}`)
- if (retry > 0) {
- void this.send(to, from, subject, body, retry - 1)
- }
+ private async send(
+ to: string | string[],
+ from: string,
+ subject: string,
+ body: string,
+ retry = 3
+ ) {
+ const multipleRecipients = Array.isArray(to)
+ const emailParams = {
+ to,
+ from,
+ subject,
+ html: body,
+ }
+ const handleError = (error) => {
+ if (error instanceof ResponseError) {
+ const { response } = error
+ const { body: errBody } = response
+ console.error(
+ `Error sending email to: ${
+ multipleRecipients ? to.toString() : to
+ }! Error body: ${errBody}`
+ )
+ if (retry > 0) {
+ void this.send(to, from, subject, body, retry - 1)
}
}
- )
+ }
+
+ await this.sendGrid.send(emailParams, multipleRecipients, handleError)
}
async invite(user: User, appUrl: string, confirmationUrl: string) {
@@ -340,4 +351,68 @@ export class EmailService {
})
)
}
+
+ public async requestApproval(user: User, listingInfo: IdName, emails: string[], appUrl: string) {
+ try {
+ const jurisdiction = await this.getUserJurisdiction(user)
+ void (await this.loadTranslations(jurisdiction, Language.en))
+ await this.send(
+ emails,
+ jurisdiction.emailFromAddress,
+ this.polyglot.t("requestApproval.header"),
+ this.template("request-approval")({
+ user,
+ appOptions: { listingName: listingInfo.name },
+ appUrl: appUrl,
+ listingUrl: `${appUrl}/listings/${listingInfo.id}`,
+ })
+ )
+ } catch (err) {
+ throw new HttpException("email failed", 500)
+ }
+ }
+
+ public async changesRequested(user: User, listingInfo: IdName, emails: string[], appUrl: string) {
+ try {
+ const jurisdiction = await this.getUserJurisdiction(user)
+ void (await this.loadTranslations(jurisdiction, Language.en))
+ await this.send(
+ emails,
+ jurisdiction.emailFromAddress,
+ this.polyglot.t("changesRequested.header"),
+ this.template("changes-requested")({
+ user,
+ appOptions: { listingName: listingInfo.name },
+ appUrl: appUrl,
+ listingUrl: `${appUrl}/listings/${listingInfo.id}`,
+ })
+ )
+ } catch (err) {
+ throw new HttpException("email failed", 500)
+ }
+ }
+
+ public async listingApproved(
+ user: User,
+ listingInfo: IdName,
+ emails: string[],
+ publicUrl: string
+ ) {
+ try {
+ const jurisdiction = await this.getUserJurisdiction(user)
+ void (await this.loadTranslations(jurisdiction, Language.en))
+ await this.send(
+ emails,
+ jurisdiction.emailFromAddress,
+ this.polyglot.t("listingApproved.header"),
+ this.template("listing-approved")({
+ user,
+ appOptions: { listingName: listingInfo.name },
+ listingUrl: `${publicUrl}/listing/${listingInfo.id}`,
+ })
+ )
+ } catch (err) {
+ throw new HttpException("email failed", 500)
+ }
+ }
}
diff --git a/backend/core/src/listings/listings.controller.ts b/backend/core/src/listings/listings.controller.ts
index 141fc30101..62f5eee3ad 100644
--- a/backend/core/src/listings/listings.controller.ts
+++ b/backend/core/src/listings/listings.controller.ts
@@ -121,6 +121,21 @@ export class ListingsController {
return mapTo(ListingDto, listing)
}
+ @Put(`updateAndNotify/:id`)
+ @ApiOperation({
+ summary: "Update listing by id and notify relevant users",
+ operationId: "updateAndNotify",
+ })
+ @UsePipes(new ListingUpdateValidationPipe(defaultValidationPipeOptions))
+ async updateAndNotify(
+ @Request() req,
+ @Param("id") listingId: string,
+ @Body() listingUpdateDto: ListingUpdateDto
+ ): Promise|
+
+ {{t "t.hello"}},
+ |
+
| + + {{t "t.editListing"}} + + | +
|
+
+ {{t "footer.thankYou"}},
+ |
+
|
+
+ {{t "t.hello"}},
+ |
+
| + + {{t "t.viewListing"}} + + | +
|
+
+ {{t "footer.thankYou"}},
+ |
+
|
+
+ {{t "t.hello"}},
+ |
+
| + + {{t "t.reviewListing"}} + + | +
|
+
+ {{t "footer.thankYou"}},
+ |
+