gs2 1.0.4 → 1.0.5

package/src/mission/model/MissionTaskModel.ts

@@ -124,27 +124,12 @@ export default class MissionTaskModel implements IModel {
         missionGroupName: string|null,
         missionTaskName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (missionGroupName == null || missionGroupName === '') {
-            return null;
-        }
-        if (missionTaskName == null || missionTaskName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{missionGroupName}', missionGroupName!)
-            .replace('{missionTaskName}', missionTaskName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{missionGroupName}', missionGroupName ?? '')
+            .replace('{missionTaskName}', missionTaskName ?? '');
     }
 
     public getMissionTaskId(): string|null {

package/src/mission/model/MissionTaskModelMaster.ts

@@ -127,27 +127,12 @@ export default class MissionTaskModelMaster implements IModel {
         missionGroupName: string|null,
         missionTaskName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (missionGroupName == null || missionGroupName === '') {
-            return null;
-        }
-        if (missionTaskName == null || missionTaskName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{missionGroupName}', missionGroupName!)
-            .replace('{missionTaskName}', missionTaskName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{missionGroupName}', missionGroupName ?? '')
+            .replace('{missionTaskName}', missionTaskName ?? '');
     }
 
     public getMissionTaskId(): string|null {

package/src/mission/model/Namespace.ts

@@ -88,19 +88,10 @@ export default class Namespace implements IModel {
         ownerId: string|null,
         namespaceName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '');
     }
 
     public getNamespaceId(): string|null {

package/src/money/model/Namespace.ts

@@ -91,19 +91,10 @@ export default class Namespace implements IModel {
         ownerId: string|null,
         namespaceName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '');
     }
 
     public getNamespaceId(): string|null {

package/src/money/model/Receipt.ts

@@ -126,27 +126,12 @@ export default class Receipt implements IModel {
         userId: string|null,
         transactionId: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (userId == null || userId === '') {
-            return null;
-        }
-        if (transactionId == null || transactionId === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{userId}', userId!)
-            .replace('{transactionId}', transactionId!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{userId}', userId ?? '')
+            .replace('{transactionId}', transactionId ?? '');
     }
 
     public getReceiptId(): string|null {

package/src/money/model/Wallet.ts

@@ -124,27 +124,12 @@ export default class Wallet implements IModel {
         userId: string|null,
         slot: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (userId == null || userId === '') {
-            return null;
-        }
-        if (slot == null || slot === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{userId}', userId!)
-            .replace('{slot}', slot!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{userId}', userId ?? '')
+            .replace('{slot}', slot ?? '');
     }
 
     public getWalletId(): string|null {

package/src/news/model/Namespace.ts

@@ -81,19 +81,10 @@ export default class Namespace implements IModel {
         ownerId: string|null,
         namespaceName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '');
     }
 
     public getNamespaceId(): string|null {

package/src/project/model/Account.ts

@@ -48,11 +48,8 @@ export default class Account implements IModel {
     public static createGrn(
         accountName: string|null,
     ): string|null {
-        if (accountName == null || accountName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{accountName}', accountName!);
+            .replace('{accountName}', accountName ?? '');
     }
 
     public getAccountId(): string|null {

package/src/project/model/Billing.ts

@@ -106,23 +106,11 @@ export default class Billing implements IModel {
         year: string|null,
         month: string|null,
     ): string|null {
-        if (accountName == null || accountName === '') {
-            return null;
-        }
-        if (projectName == null || projectName === '') {
-            return null;
-        }
-        if (year == null || year === '') {
-            return null;
-        }
-        if (month == null || month === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{accountName}', accountName!)
-            .replace('{projectName}', projectName!)
-            .replace('{year}', year!)
-            .replace('{month}', month!);
+            .replace('{accountName}', accountName ?? '')
+            .replace('{projectName}', projectName ?? '')
+            .replace('{year}', year ?? '')
+            .replace('{month}', month ?? '');
     }
 
     public getBillingId(): string|null {

package/src/project/model/BillingMethod.ts

@@ -66,15 +66,9 @@ export default class BillingMethod implements IModel {
         accountName: string|null,
         billingMethodName: string|null,
     ): string|null {
-        if (accountName == null || accountName === '') {
-            return null;
-        }
-        if (billingMethodName == null || billingMethodName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{accountName}', accountName!)
-            .replace('{billingMethodName}', billingMethodName!);
+            .replace('{accountName}', accountName ?? '')
+            .replace('{billingMethodName}', billingMethodName ?? '');
     }
 
     public getBillingMethodId(): string|null {

package/src/project/model/Project.ts

@@ -66,15 +66,9 @@ export default class Project implements IModel {
         accountName: string|null,
         projectName: string|null,
     ): string|null {
-        if (accountName == null || accountName === '') {
-            return null;
-        }
-        if (projectName == null || projectName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{accountName}', accountName!)
-            .replace('{projectName}', projectName!);
+            .replace('{accountName}', accountName ?? '')
+            .replace('{projectName}', projectName ?? '');
     }
 
     public getProjectId(): string|null {

package/src/project/model/Receipt.ts

@@ -63,15 +63,9 @@ export default class Receipt implements IModel {
         accountName: string|null,
         receiptName: string|null,
     ): string|null {
-        if (accountName == null || accountName === '') {
-            return null;
-        }
-        if (receiptName == null || receiptName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{accountName}', accountName!)
-            .replace('{receiptName}', receiptName!);
+            .replace('{accountName}', accountName ?? '')
+            .replace('{receiptName}', receiptName ?? '');
     }
 
     public getReceiptId(): string|null {

package/src/quest/model/CompletedQuestList.ts

@@ -121,27 +121,12 @@ export default class CompletedQuestList implements IModel {
         userId: string|null,
         questGroupName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (userId == null || userId === '') {
-            return null;
-        }
-        if (questGroupName == null || questGroupName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{userId}', userId!)
-            .replace('{questGroupName}', questGroupName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{userId}', userId ?? '')
+            .replace('{questGroupName}', questGroupName ?? '');
     }
 
     public getCompletedQuestListId(): string|null {

package/src/quest/model/CurrentQuestMaster.ts

@@ -75,19 +75,10 @@ export default class CurrentQuestMaster implements IModel {
         ownerId: string|null,
         namespaceName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '');
     }
 
     public getNamespaceId(): string|null {

package/src/quest/model/Namespace.ts

@@ -86,19 +86,10 @@ export default class Namespace implements IModel {
         ownerId: string|null,
         namespaceName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '');
     }
 
     public getNamespaceId(): string|null {

package/src/quest/model/Progress.ts

@@ -103,23 +103,11 @@ export default class Progress implements IModel {
         namespaceName: string|null,
         userId: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (userId == null || userId === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{userId}', userId!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{userId}', userId ?? '');
     }
 
     public getProgressId(): string|null {

package/src/quest/model/QuestGroupModel.ts

@@ -102,23 +102,11 @@ export default class QuestGroupModel implements IModel {
         namespaceName: string|null,
         questGroupName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (questGroupName == null || questGroupName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{questGroupName}', questGroupName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{questGroupName}', questGroupName ?? '');
     }
 
     public getQuestGroupModelId(): string|null {

package/src/quest/model/QuestGroupModelMaster.ts

@@ -100,23 +100,11 @@ export default class QuestGroupModelMaster implements IModel {
         namespaceName: string|null,
         questGroupName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (questGroupName == null || questGroupName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{questGroupName}', questGroupName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{questGroupName}', questGroupName ?? '');
     }
 
     public getQuestGroupModelId(): string|null {

package/src/quest/model/QuestModel.ts

@@ -126,27 +126,12 @@ export default class QuestModel implements IModel {
         questGroupName: string|null,
         questName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (questGroupName == null || questGroupName === '') {
-            return null;
-        }
-        if (questName == null || questName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{questGroupName}', questGroupName!)
-            .replace('{questName}', questName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{questGroupName}', questGroupName ?? '')
+            .replace('{questName}', questName ?? '');
     }
 
     public getQuestModelId(): string|null {

package/src/quest/model/QuestModelMaster.ts

@@ -130,27 +130,12 @@ export default class QuestModelMaster implements IModel {
         questGroupName: string|null,
         questName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (questGroupName == null || questGroupName === '') {
-            return null;
-        }
-        if (questName == null || questName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{questGroupName}', questGroupName!)
-            .replace('{questName}', questName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{questGroupName}', questGroupName ?? '')
+            .replace('{questName}', questName ?? '');
     }
 
     public getQuestModelId(): string|null {

package/src/ranking/model/CategoryModel.ts

@@ -107,23 +107,11 @@ export default class CategoryModel implements IModel {
         namespaceName: string|null,
         categoryName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (categoryName == null || categoryName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{categoryName}', categoryName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{categoryName}', categoryName ?? '');
     }
 
     public getCategoryModelId(): string|null {

package/src/ranking/model/CategoryModelMaster.ts

@@ -110,23 +110,11 @@ export default class CategoryModelMaster implements IModel {
         namespaceName: string|null,
         categoryName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
-        if (categoryName == null || categoryName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{categoryName}', categoryName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{categoryName}', categoryName ?? '');
     }
 
     public getCategoryModelId(): string|null {

package/src/ranking/model/CurrentRankingMaster.ts

@@ -75,19 +75,10 @@ export default class CurrentRankingMaster implements IModel {
         ownerId: string|null,
         namespaceName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '');
     }
 
     public getNamespaceId(): string|null {

package/src/ranking/model/Namespace.ts

@@ -82,19 +82,10 @@ export default class Namespace implements IModel {
         ownerId: string|null,
         namespaceName: string|null,
     ): string|null {
-        if (region == null || region === '') {
-            return null;
-        }
-        if (ownerId == null || ownerId === '') {
-            return null;
-        }
-        if (namespaceName == null || namespaceName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '');
     }
 
     public getNamespaceId(): string|null {