nik/OMDSCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into ccb

Browse Source
This commit is contained in:
makabe 2024-03-14 11:08:35 +09:00
commit 9b61443b2f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data_migration_tools/server/src/features/transfer/transfer.service.ts
View File

@ -144,8 +144,8 @@ export class TransferService {
}
// ライセンスのデータの作成を行う
// line.expired_dateが"9999/12/31 23:59:59"のデータの場合はデモライセンスなので登録しない
if (line.expired_date !== "9999/12/31 23:59:59") {
// line.expired_dateが"9999/12/31"で始まるデータの場合はデモライセンスなので登録しない
if (!line.expired_date.startsWith("9999/12/31")) {
// authorIdが設定されてる場合、statusは"allocated"、allocated_user_idは対象のユーザID
// されていない場合、statusは"reusable"、allocated_user_idはnull
let status: string;

7
data_migration_tools/server/src/features/verification/verification.service.ts
View File

@ -63,7 +63,7 @@ export class VerificationService {
const licensesCountFromFile =
csvInputFiles.filter(
(item) =>
item.type === "USER" && item.expired_date !== "9999/12/31 23:59:59"
item.type === "USER" && !item.expired_date.startsWith("9999/12/31")
).length + cardLicensesCountFromFile;
// 管理ユーザ数のカウント
@ -105,7 +105,8 @@ export class VerificationService {
// 重複する要素を抽出
const duplicates: { [key: string]: number } = {};
mailAdresses.forEach((str) => {
duplicates[str] = (duplicates[str] || 0) + 1;
duplicates[str.toLowerCase()] =
(duplicates[str.toLowerCase()] || 0) + 1;
});
// 重複する要素と件数を表示
@ -166,7 +167,7 @@ export class VerificationService {
VerificationResultDetails,
csvInputFiles.filter(
(item) =>
item.type === "USER" && item.expired_date !== "9999/12/31 23:59:59"
item.type === "USER" && !item.expired_date.startsWith("9999/12/31")
),
licenses.filter((item) => item.expiry_date !== null),
accountsMappingInputFiles