Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(BE:FSADT1-794): updating content #494

Merged
merged 12 commits into from
Jun 14, 2023
Merged

feat(BE:FSADT1-794): updating content #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0cba5bc
no message
mamartinezmejia Jun 7, 2023
a026abd
no message
mamartinezmejia Jun 7, 2023
1394455
FSADT1794
mamartinezmejia Jun 9, 2023
c3e27de
feat:(BE:FSADT1-745): changing mail template contents
paulushcgcj Jun 9, 2023
585cde9
chore: removing unused files
paulushcgcj Jun 9, 2023
77e8a28
chore: updating templates
paulushcgcj Jun 9, 2023
895b115
Merge branch 'main' into feat/be/FSADT1-794
Jun 9, 2023
9d0b8c7
chore: updating templates
mamartinezmejia Jun 12, 2023
0be7244
Merge branch 'main' into feat/be/FSADT1-794
mamartinezmejia Jun 12, 2023
2eca0aa
fix(be):
mamartinezmejia Jun 12, 2023
327a4d9
Merge branch 'main' into feat/be/FSADT1-794
mamartinezmejia Jun 13, 2023
50ed681
feat(be):
mamartinezmejia Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions backend/src/main/java/ca/bc/gov/app/dto/client/ClientBusinessInformationDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,26 @@
import java.util.Map;
import org.apache.commons.lang3.StringUtils;

public record ClientBusinessInformationDto(String incorporationNumber, String businessName,
String businessType, String clientType, String goodStanding, String legalType) {
public record ClientBusinessInformationDto(
String incorporationNumber,
String businessName,
String businessType,
String clientType,
String goodStanding,
String legalType) {
/**
* Returns a map containing the description of the client's business information.
*
* @return a map with keys representing the description fields and corresponding values
*/
public Map<String, Object> description() {
return Map.of(
"incorporation", StringUtils.isBlank(incorporationNumber) ? "" : incorporationNumber,
"name", StringUtils.isBlank(businessName) ? "" : businessName,
"businessType", StringUtils.isBlank(businessType) ? "" : businessType,
"clientType", StringUtils.isBlank(clientType) ? "" : clientType,
"legalType", StringUtils.isBlank(legalType) ? "" : legalType,
"goodStanding", StringUtils.isBlank(goodStanding) ? "" : goodStanding
"goodStanding", StringUtils.isBlank(goodStanding) ? "" : goodStanding,
"legalType", StringUtils.isBlank(legalType) ? "" : legalType
);
}
}
5 changes: 5 additions & 0 deletions backend/src/main/java/ca/bc/gov/app/dto/client/ClientSubmissionDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
public record ClientSubmissionDto(
ClientBusinessInformationDto businessInformation,
ClientLocationDto location) {
/**
* Returns a map containing the description of the client's business information.
*
* @return a map with keys representing the description fields and corresponding values
*/
public Map<String, Object> description(String userName) {
Map<String, Object> descriptions = location.description();
descriptions.put("business", businessInformation.description());
Expand Down
15 changes: 10 additions & 5 deletions backend/src/main/java/ca/bc/gov/app/service/client/ClientSubmissionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,18 +166,23 @@ public Mono<Integer> submit(
.location()
.contacts()
)
/*.flatMap(contact -> saveAndAssociateContact(locations, contact,
submission.getSubmissionId()))*/
/*.flatMap(contact -> saveAndAssociateContact(
locations,
contact,
submission.getSubmissionId()))*/
)
//Then grab all back as a list, to make all reactive flows complete
.collectList()
//Return what we need only
.thenReturn(submission.getSubmissionId())
)
.flatMap(submissionId -> sendEmail(submissionId, clientSubmissionDto, userEmail, userName));
.flatMap(submissionId -> sendEmail(submissionId,
clientSubmissionDto,
userEmail,
userName));
}

private Mono<SubmissionLocationContactEntity> saveAndAssociateContact(
/*private Mono<SubmissionLocationContactEntity> saveAndAssociateContact(
List<SubmissionLocationEntity> locations,
ClientContactDto contact,
Integer submissionId
Expand All @@ -192,7 +197,7 @@ private Mono<SubmissionLocationContactEntity> saveAndAssociateContact(
.build()
)
.flatMap(submissionLocationContactRepository::save);
}
}*/

private Mono<List<SubmissionLocationEntity>> saveAddresses(
ClientSubmissionDto clientSubmissionDto,
Expand Down
14 changes: 11 additions & 3 deletions backend/src/main/resources/templates/matched.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,29 @@
<p>
Dear <b>${userName}</b>,
</p>
<br />
<div>&nbsp;</div>

<p>
Your application for a client number can't go ahead because <b>${name}</b>
already has one.
</p>
<p>The number is ${number}. Be sure to keep it for your records.</p>
<br />
<div>&nbsp;</div>

<p>
If you need to contact us, email <a
href="mailto:[email protected]">[email protected].</a>
</p>
<br />
<div>&nbsp;</div>

<p>Thank you,</p>
<p>The CLIENT Team</p>
<div>&nbsp;</div>

<p>
<b>Please don’t respond to this email.</b>
It’s from an account that’s not monitored for incoming emails.
</p>
</div>

</body>
Expand Down
14 changes: 11 additions & 3 deletions backend/src/main/resources/templates/registration.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,29 @@
<p>
Dear <b>${userName}</b>,
</p>
<br />
<div>&nbsp;</div>

<p>
We’ve received your application for a client number for <b>${business.name}</b>.
</p>
<p>We’ll email your client number once we confirm the information
you provided.</p>
<br />
<div>&nbsp;</div>

<p>
If you need to contact us before then, email <a
href="mailto:[email protected]">[email protected].</a>
</p>
<br />
<div>&nbsp;</div>

<p>Thank you,</p>
<p>The CLIENT Team</p>
<div>&nbsp;</div>

<p>
<b>Please don’t respond to this email.</b>
It’s from an account that’s not monitored for incoming emails.
</p>
</div>

</body>
Expand Down