gs2 1.0.4 → 1.0.5

package/src/log/model/Namespace.ts

@@ -87,19 +87,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/lottery/model/Box.ts

@@ -121,27 +121,12 @@ export default class Box implements IModel {
         userId: string|null,
         prizeTableName: 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 (prizeTableName == null || prizeTableName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{userId}', userId!)
-            .replace('{prizeTableName}', prizeTableName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{userId}', userId ?? '')
+            .replace('{prizeTableName}', prizeTableName ?? '');
     }
 
     public getBoxId(): string|null {

package/src/lottery/model/CurrentLotteryMaster.ts

@@ -75,19 +75,10 @@ export default class CurrentLotteryMaster 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/lottery/model/LotteryModel.ts

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

package/src/lottery/model/LotteryModelMaster.ts

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

package/src/lottery/model/Namespace.ts

@@ -84,19 +84,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/lottery/model/PrizeTable.ts

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

package/src/lottery/model/PrizeTableMaster.ts

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

package/src/matchmaking/model/CurrentRatingModelMaster.ts

@@ -75,19 +75,10 @@ export default class CurrentRatingModelMaster 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/matchmaking/model/Gathering.ts

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

package/src/matchmaking/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/matchmaking/model/Rating.ts

@@ -121,27 +121,12 @@ export default class Rating implements IModel {
         userId: string|null,
         ratingName: 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 (ratingName == null || ratingName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{userId}', userId!)
-            .replace('{ratingName}', ratingName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{userId}', userId ?? '')
+            .replace('{ratingName}', ratingName ?? '');
     }
 
     public getRatingId(): string|null {

package/src/matchmaking/model/RatingModel.ts

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

package/src/matchmaking/model/RatingModelMaster.ts

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

package/src/matchmaking/model/Vote.ts

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

package/src/mission/model/Complete.ts

@@ -123,27 +123,12 @@ export default class Complete implements IModel {
         userId: 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 (userId == null || userId === '') {
-            return null;
-        }
-        if (missionGroupName == null || missionGroupName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{userId}', userId!)
-            .replace('{missionGroupName}', missionGroupName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{userId}', userId ?? '')
+            .replace('{missionGroupName}', missionGroupName ?? '');
     }
 
     public getCompleteId(): string|null {

package/src/mission/model/Counter.ts

@@ -122,27 +122,12 @@ export default class Counter implements IModel {
         userId: string|null,
         counterName: 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 (counterName == null || counterName === '') {
-            return null;
-        }
         return grnFormat
-            .replace('{region}', region!)
-            .replace('{ownerId}', ownerId!)
-            .replace('{namespaceName}', namespaceName!)
-            .replace('{userId}', userId!)
-            .replace('{counterName}', counterName!);
+            .replace('{region}', region ?? '')
+            .replace('{ownerId}', ownerId ?? '')
+            .replace('{namespaceName}', namespaceName ?? '')
+            .replace('{userId}', userId ?? '')
+            .replace('{counterName}', counterName ?? '');
     }
 
     public getCounterId(): string|null {

package/src/mission/model/CounterModel.ts

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

package/src/mission/model/CounterModelMaster.ts

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

package/src/mission/model/CurrentMissionMaster.ts

@@ -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

@@ -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

@@ -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 {