Merged PR 740: トライアルライセンスを有効にしても有効化メールが届かない対応
## 概要 [Task3651: トライアルライセンスを有効にしても有効化メールが届かない対応](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/3651) - ライセンス割り当て時のメール(U-108)について、ディーラーが設定されていない場合にはディーラー関連の文言を表示しないように修正しました。 ## レビューポイント - メッセージ内容は適切でしょうか? - ディーラーの取り扱いは適切でしょうか? ## UIの変更 - なし ## 動作確認状況 - ローカルで確認
This commit is contained in:
parent
7ca4249f04
commit
a9d326c234
@ -1073,13 +1073,13 @@ export class UsersService {
|
||||
const { parent_account_id: dealerId } =
|
||||
await this.accountsRepository.findAccountById(context, accountId);
|
||||
|
||||
if (dealerId == null) {
|
||||
throw new Error(`dealer is null. account_id=${accountId}`);
|
||||
let dealerName: string | null = null;
|
||||
if (dealerId !== null) {
|
||||
const { company_name } =
|
||||
await this.accountsRepository.findAccountById(context, dealerId);
|
||||
dealerName = company_name;
|
||||
}
|
||||
|
||||
const { company_name: dealerName } =
|
||||
await this.accountsRepository.findAccountById(context, dealerId);
|
||||
|
||||
const { companyName, adminEmails } = await this.getAccountInformation(
|
||||
context,
|
||||
accountId,
|
||||
|
||||
@ -41,6 +41,9 @@ export class SendGridService {
|
||||
private readonly templateU107Text: string;
|
||||
private readonly templateU108Html: string;
|
||||
private readonly templateU108Text: string;
|
||||
// U-108のテンプレート差分(親アカウントがない場合)
|
||||
private readonly templateU108NoParentHtml: string;
|
||||
private readonly templateU108NoParentText: string;
|
||||
private readonly templateU109Html: string;
|
||||
private readonly templateU109Text: string;
|
||||
private readonly templateU111Html: string;
|
||||
@ -118,6 +121,17 @@ export class SendGridService {
|
||||
path.resolve(__dirname, `../../templates/template_U_108.txt`),
|
||||
'utf-8',
|
||||
);
|
||||
this.templateU108NoParentHtml = readFileSync(
|
||||
path.resolve(
|
||||
__dirname,
|
||||
`../../templates/template_U_108_no_parent.html`,
|
||||
),
|
||||
'utf-8',
|
||||
);
|
||||
this.templateU108NoParentText = readFileSync(
|
||||
path.resolve(__dirname, `../../templates/template_U_108_no_parent.txt`),
|
||||
'utf-8',
|
||||
);
|
||||
this.templateU109Html = readFileSync(
|
||||
path.resolve(__dirname, `../../templates/template_U_109.html`),
|
||||
'utf-8',
|
||||
@ -462,7 +476,7 @@ export class SendGridService {
|
||||
userMail: string,
|
||||
customerAdminMails: string[],
|
||||
customerAccountName: string,
|
||||
dealerAccountName: string,
|
||||
dealerAccountName: string | null,
|
||||
): Promise<void> {
|
||||
this.logger.log(
|
||||
`[IN] [${context.getTrackingId()}] ${this.sendMailWithU108.name}`,
|
||||
@ -471,19 +485,34 @@ export class SendGridService {
|
||||
const subject = 'License Assigned Notification [U-108]';
|
||||
const url = new URL(this.appDomain).href;
|
||||
|
||||
// メールの本文を作成する
|
||||
const html = this.templateU108Html
|
||||
.replaceAll(CUSTOMER_NAME, customerAccountName)
|
||||
.replaceAll(DEALER_NAME, dealerAccountName)
|
||||
.replaceAll(USER_NAME, userName)
|
||||
.replaceAll(USER_EMAIL, userMail)
|
||||
.replaceAll(TOP_URL, url);
|
||||
const text = this.templateU108Text
|
||||
.replaceAll(CUSTOMER_NAME, customerAccountName)
|
||||
.replaceAll(DEALER_NAME, dealerAccountName)
|
||||
.replaceAll(USER_NAME, userName)
|
||||
.replaceAll(USER_EMAIL, userMail)
|
||||
.replaceAll(TOP_URL, url);
|
||||
let html: string;
|
||||
let text: string;
|
||||
|
||||
if (dealerAccountName === null) {
|
||||
html = this.templateU108NoParentHtml
|
||||
.replaceAll(CUSTOMER_NAME, customerAccountName)
|
||||
.replaceAll(USER_NAME, userName)
|
||||
.replaceAll(USER_EMAIL, userMail)
|
||||
.replaceAll(TOP_URL, url);
|
||||
text = this.templateU108NoParentText
|
||||
.replaceAll(CUSTOMER_NAME, customerAccountName)
|
||||
.replaceAll(USER_NAME, userName)
|
||||
.replaceAll(USER_EMAIL, userMail)
|
||||
.replaceAll(TOP_URL, url);
|
||||
} else {
|
||||
html = this.templateU108Html
|
||||
.replaceAll(CUSTOMER_NAME, customerAccountName)
|
||||
.replaceAll(DEALER_NAME, dealerAccountName)
|
||||
.replaceAll(USER_NAME, userName)
|
||||
.replaceAll(USER_EMAIL, userMail)
|
||||
.replaceAll(TOP_URL, url);
|
||||
text = this.templateU108Text
|
||||
.replaceAll(CUSTOMER_NAME, customerAccountName)
|
||||
.replaceAll(DEALER_NAME, dealerAccountName)
|
||||
.replaceAll(USER_NAME, userName)
|
||||
.replaceAll(USER_EMAIL, userMail)
|
||||
.replaceAll(TOP_URL, url);
|
||||
}
|
||||
|
||||
const ccAddress = customerAdminMails.includes(userMail) ? [] : [userMail];
|
||||
|
||||
|
||||
69
dictation_server/src/templates/template_U_108_no_parent.html
Normal file
69
dictation_server/src/templates/template_U_108_no_parent.html
Normal file
@ -0,0 +1,69 @@
|
||||
<html>
|
||||
<head>
|
||||
<title>License Assigned Notification [U-108]</title>
|
||||
</head>
|
||||
<body>
|
||||
<div>
|
||||
<h3><English></h3>
|
||||
<p>Dear $CUSTOMER_NAME$,</p>
|
||||
<p>
|
||||
Please be informed that a license has been assigned to the following
|
||||
user.<br />
|
||||
- User Name: $USER_NAME$<br />
|
||||
- Email: $USER_EMAIL$
|
||||
</p>
|
||||
<p>
|
||||
Please log in to ODMS Cloud to verify the license expiration date.<br />
|
||||
URL: $TOP_URL$
|
||||
</p>
|
||||
<p>
|
||||
If you have received this e-mail in error, please delete this e-mail
|
||||
from your system.<br />
|
||||
This is an automatically generated e-mail and this mailbox is not
|
||||
monitored. Please do not reply.
|
||||
</p>
|
||||
</div>
|
||||
<div>
|
||||
<h3><Deutsch></h3>
|
||||
<p>Sehr geehrte(r) $CUSTOMER_NAME$,</p>
|
||||
<p>
|
||||
Bitte beachten Sie, dass dem folgenden Benutzer eine Lizenz zugewiesen
|
||||
wurde.<br />
|
||||
- Nutzername: $USER_NAME$<br />
|
||||
- Email: $USER_EMAIL$
|
||||
</p>
|
||||
<p>
|
||||
Bitte melden Sie sich bei ODMS Cloud an, um das Ablaufdatum der Lizenz
|
||||
zu überprüfen.<br />
|
||||
URL: $TOP_URL$
|
||||
</p>
|
||||
<p>
|
||||
Wenn Sie diese E-Mail fälschlicherweise erhalten haben, löschen Sie
|
||||
diese E-Mail bitte aus Ihrem System.<br />
|
||||
Dies ist eine automatisch generierte E-Mail und dieses Postfach wird
|
||||
nicht überwacht. Bitte nicht antworten.
|
||||
</p>
|
||||
</div>
|
||||
<div>
|
||||
<h3><Français></h3>
|
||||
<p>Chère/Cher $CUSTOMER_NAME$,</p>
|
||||
<p>
|
||||
Veuillez être informé qu'une licence a été attribuée à l'utilisateur
|
||||
suivant.<br />
|
||||
- Nom d'utilisateur: $USER_NAME$<br />
|
||||
- Email: $USER_EMAIL$
|
||||
</p>
|
||||
<p>
|
||||
Veuillez vous connecter à ODMS Cloud pour vérifier la date d'expiration
|
||||
de la licence.<br />
|
||||
URL: $TOP_URL$
|
||||
</p>
|
||||
<p>
|
||||
Si vous avez reçu cet e-mail par erreur, veuillez supprimer cet e-mail
|
||||
de votre système.<br />
|
||||
Il s'agit d'un e-mail généré automatiquement et cette boîte aux lettres
|
||||
n'est pas surveillée. Merci de ne pas répondre.
|
||||
</p>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
41
dictation_server/src/templates/template_U_108_no_parent.txt
Normal file
41
dictation_server/src/templates/template_U_108_no_parent.txt
Normal file
@ -0,0 +1,41 @@
|
||||
<English>
|
||||
|
||||
Dear $CUSTOMER_NAME$,
|
||||
|
||||
Please be informed that a license has been assigned to the following user.
|
||||
- User Name: $USER_NAME$
|
||||
- Email: $USER_EMAIL$
|
||||
|
||||
Please log in to ODMS Cloud to verify the license expiration date.
|
||||
URL: $TOP_URL$
|
||||
|
||||
If you have received this e-mail in error, please delete this e-mail from your system.
|
||||
This is an automatically generated e-mail and this mailbox is not monitored. Please do not reply.
|
||||
|
||||
<Deutsch>
|
||||
|
||||
Sehr geehrte(r) $CUSTOMER_NAME$,
|
||||
|
||||
Bitte beachten Sie, dass dem folgenden Benutzer eine Lizenz zugewiesen wurde.
|
||||
- Nutzername: $USER_NAME$
|
||||
- Email: $USER_EMAIL$
|
||||
|
||||
Bitte melden Sie sich bei ODMS Cloud an, um das Ablaufdatum der Lizenz zu überprüfen.
|
||||
URL: $TOP_URL$
|
||||
|
||||
Wenn Sie diese E-Mail fälschlicherweise erhalten haben, löschen Sie diese E-Mail bitte aus Ihrem System.
|
||||
Dies ist eine automatisch generierte E-Mail und dieses Postfach wird nicht überwacht. Bitte nicht antworten.
|
||||
|
||||
<Français>
|
||||
|
||||
Chère/Cher $CUSTOMER_NAME$,
|
||||
|
||||
Veuillez être informé qu'une licence a été attribuée à l'utilisateur suivant.
|
||||
- Nom d'utilisateur: $USER_NAME$
|
||||
- Email: $USER_EMAIL$
|
||||
|
||||
Veuillez vous connecter à ODMS Cloud pour vérifier la date d'expiration de la licence.
|
||||
URL: $TOP_URL$
|
||||
|
||||
Si vous avez reçu cet e-mail par erreur, veuillez supprimer cet e-mail de votre système.
|
||||
Il s'agit d'un e-mail généré automatiquement et cette boîte aux lettres n'est pas surveillée. Merci de ne pas répondre.
|
||||
Loading…
x
Reference in New Issue
Block a user