gs2 1.0.4 → 1.3.0

package/src/mission/model/CurrentMissionMaster.ts

@@ -58,13 +58,13 @@ export default class CurrentMissionMaster implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
         return true;
@@ -75,19 +75,10 @@ export default class CurrentMissionMaster 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/mission/model/MissionGroupModel.ts

@@ -83,16 +83,16 @@ export default class MissionGroupModel implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getMissionGroupName(grn) == null) {
+        if (this.getMissionGroupName(grn) == null || this.getMissionGroupName(grn) === '') {
             return false;
         }
         return true;
@@ -104,23 +104,11 @@ export default class MissionGroupModel implements IModel {
         namespaceName: string|null,
         missionGroupName: 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;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{missionGroupName}', missionGroupName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{missionGroupName}', missionGroupName ?? '');
     }
 
     public getMissionGroupId(): string|null {

package/src/mission/model/MissionGroupModelMaster.ts

@@ -83,16 +83,16 @@ export default class MissionGroupModelMaster implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getMissionGroupName(grn) == null) {
+        if (this.getMissionGroupName(grn) == null || this.getMissionGroupName(grn) === '') {
             return false;
         }
         return true;
@@ -104,23 +104,11 @@ export default class MissionGroupModelMaster implements IModel {
         namespaceName: string|null,
         missionGroupName: 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;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{missionGroupName}', missionGroupName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{missionGroupName}', missionGroupName ?? '');
     }
 
     public getMissionGroupId(): string|null {

package/src/mission/model/MissionTaskModel.ts

@@ -99,19 +99,19 @@ export default class MissionTaskModel implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getMissionGroupName(grn) == null) {
+        if (this.getMissionGroupName(grn) == null || this.getMissionGroupName(grn) === '') {
             return false;
         }
-        if (this.getMissionTaskName(grn) == null) {
+        if (this.getMissionTaskName(grn) == null || this.getMissionTaskName(grn) === '') {
             return false;
         }
         return true;
@@ -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

@@ -102,19 +102,19 @@ export default class MissionTaskModelMaster implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getMissionGroupName(grn) == null) {
+        if (this.getMissionGroupName(grn) == null || this.getMissionGroupName(grn) === '') {
             return false;
         }
-        if (this.getMissionTaskName(grn) == null) {
+        if (this.getMissionTaskName(grn) == null || this.getMissionTaskName(grn) === '') {
             return false;
         }
         return true;
@@ -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

@@ -71,13 +71,13 @@ export default class Namespace implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
         return true;
@@ -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

@@ -74,13 +74,13 @@ export default class Namespace implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
         return true;
@@ -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

@@ -101,19 +101,19 @@ export default class Receipt implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getUserId(grn) == null) {
+        if (this.getUserId(grn) == null || this.getUserId(grn) === '') {
             return false;
         }
-        if (this.getTransactionId(grn) == null) {
+        if (this.getTransactionId(grn) == null || this.getTransactionId(grn) === '') {
             return false;
         }
         return true;
@@ -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

@@ -99,19 +99,19 @@ export default class Wallet implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
-        if (this.getUserId(grn) == null) {
+        if (this.getUserId(grn) == null || this.getUserId(grn) === '') {
             return false;
         }
-        if (this.getSlot(grn) == null) {
+        if (this.getSlot(grn) == null || this.getSlot(grn) === '') {
             return false;
         }
         return true;
@@ -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

@@ -64,13 +64,13 @@ export default class Namespace implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getRegion(grn) == null) {
+        if (this.getRegion(grn) == null || this.getRegion(grn) === '') {
             return false;
         }
-        if (this.getOwnerId(grn) == null) {
+        if (this.getOwnerId(grn) == null || this.getOwnerId(grn) === '') {
             return false;
         }
-        if (this.getNamespaceName(grn) == null) {
+        if (this.getNamespaceName(grn) == null || this.getNamespaceName(grn) === '') {
             return false;
         }
         return true;
@@ -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

@@ -39,7 +39,7 @@ export default class Account implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getAccountName(grn) == null) {
+        if (this.getAccountName(grn) == null || this.getAccountName(grn) === '') {
             return false;
         }
         return true;
@@ -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

@@ -85,16 +85,16 @@ export default class Billing implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getAccountName(grn) == null) {
+        if (this.getAccountName(grn) == null || this.getAccountName(grn) === '') {
             return false;
         }
-        if (this.getProjectName(grn) == null) {
+        if (this.getProjectName(grn) == null || this.getProjectName(grn) === '') {
             return false;
         }
-        if (this.getYear(grn) == null) {
+        if (this.getYear(grn) == null || this.getYear(grn) === '') {
             return false;
         }
-        if (this.getMonth(grn) == null) {
+        if (this.getMonth(grn) == null || this.getMonth(grn) === '') {
             return false;
         }
         return true;
@@ -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

@@ -53,10 +53,10 @@ export default class BillingMethod implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getAccountName(grn) == null) {
+        if (this.getAccountName(grn) == null || this.getAccountName(grn) === '') {
             return false;
         }
-        if (this.getBillingMethodName(grn) == null) {
+        if (this.getBillingMethodName(grn) == null || this.getBillingMethodName(grn) === '') {
             return false;
         }
         return true;
@@ -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

@@ -53,10 +53,10 @@ export default class Project implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getAccountName(grn) == null) {
+        if (this.getAccountName(grn) == null || this.getAccountName(grn) === '') {
             return false;
         }
-        if (this.getProjectName(grn) == null) {
+        if (this.getProjectName(grn) == null || this.getProjectName(grn) === '') {
             return false;
         }
         return true;
@@ -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

@@ -50,10 +50,10 @@ export default class Receipt implements IModel {
     }
 
     public static isValid(grn: string): boolean {
-        if (this.getAccountName(grn) == null) {
+        if (this.getAccountName(grn) == null || this.getAccountName(grn) === '') {
             return false;
         }
-        if (this.getReceiptName(grn) == null) {
+        if (this.getReceiptName(grn) == null || this.getReceiptName(grn) === '') {
             return false;
         }
         return true;
@@ -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 {