ids moved to each module #64 #65 #66 #67 #68

isuru89 · Aug 29, 2020 · d1eb1e2 · d1eb1e2
1 parent 14a8006
commit d1eb1e2
Show file tree

Hide file tree

Showing 131 changed files with 341 additions and 8,552 deletions.
diff --git a/core/src/main/java/io/github/oasis/core/ID.java b/core/src/main/java/io/github/oasis/core/ID.java
@@ -19,8 +19,6 @@
 
 package io.github.oasis.core;
 
-import io.github.oasis.core.utils.Texts;
-
 /**
  * @author Isuru Weerarathna
  */
@@ -53,104 +51,4 @@ public static String getGameAttributesInfoKey(int gameId) {
         return String.format(ALL_ATTRIBUTE_DEFINITIONS, gameId);
     }
 
-    public static String getGameUserPointsSummary(int gameId, long userId) {
-        return String.format("g%d:u%d:points", gameId, userId);
-    }
-
-    public static String getGameLeaderboard(int gameId, String trait, String duration) {
-        if (Texts.isEmpty(duration)) {
-            return String.format("g%d:leaderboard:%s", gameId, trait);
-        } else {
-            return String.format("g%d:leaderboard:%s:%s", gameId, trait, duration);
-        }
-    }
-
-    public static String getGameTeamLeaderboard(int gameId, long teamId, String trait, String duration) {
-        if (Texts.isEmpty(duration)) {
-            return String.format("g%d:t%d:leaderboard:%s", gameId, teamId, trait);
-        } else {
-            return String.format("g%d:t%d:leaderboard:%s:%s", gameId, teamId, trait, duration);
-        }
-    }
-
-    public static String getGameUseChallengesSummary(int gameId, long userId) {
-        return String.format("g%d:u%d:challenges", gameId, userId);
-    }
-
-    public static String getGameUseChallengesLog(int gameId, long userId) {
-        return String.format("g%d:u%d:challengeslog", gameId, userId);
-    }
-
-    public static String getGameUserBadgesSummary(int gameId, long userId) {
-        return String.format("g%d:u%d:badges", gameId, userId);
-    }
-
-    public static String getGameUserBadgesLog(int gameId, long userId) {
-        return String.format("g%d:u%d:badgeslog", gameId, userId);
-    }
-
-    public static String getGameUserRatingsLog(int gameId, long userId) {
-        return String.format("g%d:u%d:ratingslog", gameId, userId);
-    }
-
-    public static String getUserRatingsKey(int gameId, long userId, String ratingId) {
-        return String.format("u%d:g%d:rt:%s", userId, gameId, ratingId);
-    }
-
-    public static String getGameRatingKey(int gameId, String ratingId) {
-        return String.format("g%d:rating:%s", gameId, ratingId);
-    }
-
-    public static String getGameChallengesKey(int gameId) {
-        return String.format("g%d:challenges", gameId);
-    }
-
-    public static String getGameChallengeKey(int gameId, String ruleId) {
-        return String.format("g%d:ch:%s", gameId, ruleId);
-    }
-
-    public static String getGameChallengeEventsKey(int gameId, String ruleId) {
-        return String.format("g%d:challengeevents:%s", gameId, ruleId);
-    }
-
-    public static String getGameChallengeOOORefKey(int gameId, String ruleId) {
-        return String.format("g%d:challengeoooref:%s", gameId, ruleId);
-    }
-
-    public static String getGameChallengeSubKey(String ruleId, String metaStatus) {
-        return String.format("%s:%s", ruleId, metaStatus);
-    }
-
-    public static String getUserKeyUnderGameMilestone(long userId) {
-        return String.valueOf(userId);
-    }
-
-    public static String getPenaltiesUserKeyUnderGameMilestone(long userId) {
-        return String.format("u%d:penalties", userId);
-    }
-
-    public static String getUserFirstEventsKey(int gameId, long userId) {
-        return String.format("u%d:g%d:firstevents", userId, gameId);
-    }
-
-    public static String getBadgeHistogramKey(int gameId, long userId, String badgeId) {
-        return String.format("u%d:g%d:badges:h:%s", userId, gameId, badgeId);
-    }
-
-    public static String getUserBadgeSpecKey(int gameId, long userId, String badgeId) {
-        return String.format("u%d:g%d:badges:%s", userId, gameId, badgeId);
-    }
-
-    public static String getUserBadgeStreakKey(int gameId, long userId, String badgeId) {
-        return String.format("u%d:g%d:%s:streak", userId, gameId, badgeId);
-    }
-
-    public static String getUserTemporalBadgeKey(int gameId, long userId, String badgeId) {
-        return String.format("u%d:g%d:%s:temporal", userId, gameId, badgeId);
-    }
-
-    public static String getUserBadgesMetaKey(int gameId, long userId) {
-        return String.format("u%d:g%d:bgmeta", userId, gameId);
-    }
-
 }
diff --git a/elements/badges/src/main/java/io/github/oasis/elements/badges/BadgeIDs.java b/elements/badges/src/main/java/io/github/oasis/elements/badges/BadgeIDs.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package io.github.oasis.elements.badges;
+
+/**
+ * @author Isuru Weerarathna
+ */
+public final class BadgeIDs {
+
+    public static String getGameUserBadgesSummary(int gameId, long userId) {
+        return String.format("g%d:u%d:badges", gameId, userId);
+    }
+
+    public static String getGameUserBadgesLog(int gameId, long userId) {
+        return String.format("g%d:u%d:badgeslog", gameId, userId);
+    }
+
+    public static String getUserFirstEventsKey(int gameId, long userId) {
+        return String.format("u%d:g%d:firstevents", userId, gameId);
+    }
+
+    public static String getBadgeHistogramKey(int gameId, long userId, String badgeId) {
+        return String.format("u%d:g%d:badges:h:%s", userId, gameId, badgeId);
+    }
+
+    public static String getUserBadgeSpecKey(int gameId, long userId, String badgeId) {
+        return String.format("u%d:g%d:badges:%s", userId, gameId, badgeId);
+    }
+
+    public static String getUserBadgeStreakKey(int gameId, long userId, String badgeId) {
+        return String.format("u%d:g%d:%s:streak", userId, gameId, badgeId);
+    }
+
+    public static String getUserTemporalBadgeKey(int gameId, long userId, String badgeId) {
+        return String.format("u%d:g%d:%s:temporal", userId, gameId, badgeId);
+    }
+
+    public static String getUserBadgesMetaKey(int gameId, long userId) {
+        return String.format("u%d:g%d:bgmeta", userId, gameId);
+    }
+
+
+    private BadgeIDs() {}
+
+}
diff --git a/elements/badges/src/main/java/io/github/oasis/elements/badges/BadgeSink.java b/elements/badges/src/main/java/io/github/oasis/elements/badges/BadgeSink.java
@@ -19,7 +19,6 @@
 
 package io.github.oasis.elements.badges;
 
-import io.github.oasis.core.ID;
 import io.github.oasis.core.context.ExecutionContext;
 import io.github.oasis.core.elements.AbstractRule;
 import io.github.oasis.core.elements.AbstractSink;
@@ -76,7 +75,7 @@ public List<Signal> consume(Signal badgeSignal, AbstractRule badgeRule, Executio
             int addition = isRemoval ? -1 : 1;
 
             // badge log
-            Sorted badgeLog = db.SORTED(ID.getGameUserBadgesLog(gameId, userId));
+            Sorted badgeLog = db.SORTED(BadgeIDs.getGameUserBadgesLog(gameId, userId));
 
             if (isRemoval) {
                 removeFromBadgeLog(signal, badgeLog);
@@ -90,7 +89,7 @@ public List<Signal> consume(Signal badgeSignal, AbstractRule badgeRule, Executio
                 }
             }
 
-            Mapped badgesMap = db.MAP(ID.getGameUserBadgesSummary(gameId, userId));
+            Mapped badgesMap = db.MAP(BadgeIDs.getGameUserBadgesSummary(gameId, userId));
 
             TimeOffset tcx = new TimeOffset(ts, context.getUserTimeOffset());
 

diff --git a/...dges/src/main/java/io/github/oasis/elements/badges/processors/AbstractBadgeProcessor.java b/...dges/src/main/java/io/github/oasis/elements/badges/processors/AbstractBadgeProcessor.java
@@ -20,14 +20,14 @@
 package io.github.oasis.elements.badges.processors;
 
 import io.github.oasis.core.Event;
-import io.github.oasis.core.ID;
 import io.github.oasis.core.context.ExecutionContext;
 import io.github.oasis.core.elements.AbstractProcessor;
 import io.github.oasis.core.elements.AbstractRule;
 import io.github.oasis.core.elements.RuleContext;
 import io.github.oasis.core.external.Db;
 import io.github.oasis.core.external.DbContext;
 import io.github.oasis.core.external.Mapped;
+import io.github.oasis.elements.badges.BadgeIDs;
 import io.github.oasis.elements.badges.StreakSupport;
 import io.github.oasis.elements.badges.rules.BadgeRule;
 import io.github.oasis.elements.badges.signals.BadgeSignal;
@@ -54,10 +54,10 @@ protected String getMetaEndTimeKey(AbstractRule rule) {
 
     @Override
     protected void beforeEmit(BadgeSignal signal, Event event, R rule, ExecutionContext context, DbContext db) {
-        db.addToSorted(ID.getUserBadgeSpecKey(event.getGameId(), event.getUser(), rule.getId()),
+        db.addToSorted(BadgeIDs.getUserBadgeSpecKey(event.getGameId(), event.getUser(), rule.getId()),
                 String.format(BADGE_HISTORY_FORMAT, signal.getEndTime(), rule.getId(), signal.getStartTime(), signal.getAttribute()),
                 signal.getStartTime());
-        String userBadgesMeta = ID.getUserBadgesMetaKey(event.getGameId(), event.getUser());
+        String userBadgesMeta = BadgeIDs.getUserBadgesMetaKey(event.getGameId(), event.getUser());
         Mapped map = db.MAP(userBadgesMeta);
         String value = map.getValue(rule.getId());
         int streak = 0;

diff --git a/...ents/badges/src/main/java/io/github/oasis/elements/badges/processors/BadgeFirstEvent.java b/...ents/badges/src/main/java/io/github/oasis/elements/badges/processors/BadgeFirstEvent.java
@@ -20,11 +20,11 @@
 package io.github.oasis.elements.badges.processors;
 
 import io.github.oasis.core.Event;
-import io.github.oasis.core.ID;
 import io.github.oasis.core.context.ExecutionContext;
 import io.github.oasis.core.elements.RuleContext;
 import io.github.oasis.core.external.Db;
 import io.github.oasis.core.external.DbContext;
+import io.github.oasis.elements.badges.BadgeIDs;
 import io.github.oasis.elements.badges.rules.FirstEventBadgeRule;
 import io.github.oasis.elements.badges.signals.BadgeSignal;
 
@@ -45,7 +45,7 @@ public BadgeFirstEvent(Db pool, RuleContext<FirstEventBadgeRule> ruleContext) {
 
     @Override
     public List<BadgeSignal> process(Event event, FirstEventBadgeRule rule, ExecutionContext context, DbContext db) {
-        String key = ID.getUserFirstEventsKey(event.getGameId(), event.getUser());
+        String key = BadgeIDs.getUserFirstEventsKey(event.getGameId(), event.getUser());
         long ts = event.getTimestamp();
         String id = event.getExternalId();
         String subKey = rule.getEventName();

diff --git a/...s/src/main/java/io/github/oasis/elements/badges/processors/ConditionalBadgeProcessor.java b/...s/src/main/java/io/github/oasis/elements/badges/processors/ConditionalBadgeProcessor.java
@@ -20,12 +20,12 @@
 package io.github.oasis.elements.badges.processors;
 
 import io.github.oasis.core.Event;
-import io.github.oasis.core.ID;
 import io.github.oasis.core.context.ExecutionContext;
 import io.github.oasis.core.elements.RuleContext;
 import io.github.oasis.core.external.Db;
 import io.github.oasis.core.external.DbContext;
 import io.github.oasis.core.external.Mapped;
+import io.github.oasis.elements.badges.BadgeIDs;
 import io.github.oasis.elements.badges.rules.ConditionalBadgeRule;
 import io.github.oasis.elements.badges.signals.BadgeSignal;
 import io.github.oasis.elements.badges.signals.ConditionalBadgeSignal;
@@ -68,7 +68,7 @@ public List<BadgeSignal> process(Event event, ConditionalBadgeRule rule, Executi
         if (first.isPresent()) {
             ConditionalBadgeRule.Condition condition = first.get();
             int attrId = condition.getAttribute();
-            String badgeMetaKey = ID.getUserBadgesMetaKey(event.getGameId(), event.getUser());
+            String badgeMetaKey = BadgeIDs.getUserBadgesMetaKey(event.getGameId(), event.getUser());
             String attrKey = rule.getId() + ATTR_DELIMETER + attrId;
             Mapped map = db.MAP(badgeMetaKey);
             long count = map.incrementByOne(attrKey);

diff --git a/...dges/src/main/java/io/github/oasis/elements/badges/processors/PeriodicBadgeProcessor.java b/...dges/src/main/java/io/github/oasis/elements/badges/processors/PeriodicBadgeProcessor.java
@@ -20,12 +20,12 @@
 package io.github.oasis.elements.badges.processors;
 
 import io.github.oasis.core.Event;
-import io.github.oasis.core.ID;
 import io.github.oasis.core.context.ExecutionContext;
 import io.github.oasis.core.elements.RuleContext;
 import io.github.oasis.core.external.Db;
 import io.github.oasis.core.external.DbContext;
 import io.github.oasis.core.external.Mapped;
+import io.github.oasis.elements.badges.BadgeIDs;
 import io.github.oasis.elements.badges.rules.PeriodicBadgeRule;
 import io.github.oasis.elements.badges.signals.BadgeRemoveSignal;
 import io.github.oasis.elements.badges.signals.BadgeSignal;
@@ -68,7 +68,7 @@ public boolean isDenied(Event event, ExecutionContext context) {
     @Override
     public List<BadgeSignal> process(Event event, PeriodicBadgeRule rule, ExecutionContext context, DbContext db) {
         BigDecimal value = resolveValueOfEvent(event, rule, context);
-        String badgeKey = ID.getUserTemporalBadgeKey(event.getGameId(), event.getUser(), rule.getId());
+        String badgeKey = BadgeIDs.getUserTemporalBadgeKey(event.getGameId(), event.getUser(), rule.getId());
         Mapped map = db.MAP(badgeKey);
         long ts = event.getTimestamp() + context.getUserTimeOffset();
         long tsUnit = ts - (ts % rule.getTimeUnit());

diff --git a/...badges/src/main/java/io/github/oasis/elements/badges/processors/PeriodicStreakNBadge.java b/...badges/src/main/java/io/github/oasis/elements/badges/processors/PeriodicStreakNBadge.java
@@ -20,14 +20,14 @@
 package io.github.oasis.elements.badges.processors;
 
 import io.github.oasis.core.Event;
-import io.github.oasis.core.ID;
 import io.github.oasis.core.collect.Record;
 import io.github.oasis.core.context.ExecutionContext;
 import io.github.oasis.core.elements.RuleContext;
 import io.github.oasis.core.external.Db;
 import io.github.oasis.core.external.DbContext;
 import io.github.oasis.core.external.Mapped;
 import io.github.oasis.core.external.Sorted;
+import io.github.oasis.elements.badges.BadgeIDs;
 import io.github.oasis.elements.badges.rules.PeriodicStreakNRule;
 import io.github.oasis.elements.badges.signals.BadgeSignal;
 import io.github.oasis.elements.badges.signals.HistogramBadgeRemovalSignal;
@@ -76,7 +76,7 @@ public PeriodicStreakNBadge(Db pool, RuleContext<PeriodicStreakNRule> ruleContex
 
     @Override
     public List<BadgeSignal> process(Event event, PeriodicStreakNRule rule, ExecutionContext context, DbContext db) {
-        String badgeKey = ID.getBadgeHistogramKey(event.getGameId(), event.getUser(), rule.getId());
+        String badgeKey = BadgeIDs.getBadgeHistogramKey(event.getGameId(), event.getUser(), rule.getId());
         Sorted sortedRange = db.SORTED(badgeKey);
         long timestamp = event.getTimestamp() - (event.getTimestamp() % rule.getTimeUnit());
         BigDecimal value = evaluateForValue(event, context).setScale(SCALE, RoundingMode.HALF_UP);
@@ -102,7 +102,7 @@ public List<BadgeSignal> process(Event event, PeriodicStreakNRule rule, Executio
             if (rule.isConsecutive()) {
                 return fold(seq, event, rule, db, false);
             } else {
-                String metaBadgesInfoKey = ID.getUserBadgesMetaKey(event.getGameId(), event.getUser());
+                String metaBadgesInfoKey = BadgeIDs.getUserBadgesMetaKey(event.getGameId(), event.getUser());
                 Mapped map = db.MAP(metaBadgesInfoKey);
                 String totalSubKey = String.format("%s:total", rule.getId());
                 String firstSubKey = String.format("%s:first", rule.getId());
@@ -139,7 +139,7 @@ public List<BadgeSignal> process(Event event, PeriodicStreakNRule rule, Executio
             if (rule.isConsecutive()) {
                 return unfold(seq, event, timestamp, rule, db);
             } else {
-                String metaBadgesInfoKey = ID.getUserBadgesMetaKey(event.getGameId(), event.getUser());
+                String metaBadgesInfoKey = BadgeIDs.getUserBadgesMetaKey(event.getGameId(), event.getUser());
                 Mapped map = db.MAP(metaBadgesInfoKey);
                 String totalSubKey = String.format("%s:total", rule.getId());
                 String firstSubKey = String.format("%s:first", rule.getId());
@@ -218,7 +218,7 @@ public List<BadgeSignal> fold(List<Record> tuples, Event event, PeriodicStreakNR
 
         long lastBadgeTs = 0L;
         int lastBadgeStreak = 0;
-        String badgeMetaKey = ID.getUserBadgesMetaKey(event.getGameId(), event.getUser());
+        String badgeMetaKey = BadgeIDs.getUserBadgesMetaKey(event.getGameId(), event.getUser());
         List<String> badgeInfos = db.getValuesFromMap(badgeMetaKey, getMetaEndTimeKey(rule), getMetaStreakKey(rule));
         lastBadgeTs = asLong(badgeInfos.get(0));
         lastBadgeStreak = asInt(badgeInfos.get(1));

diff --git a/...adges/src/main/java/io/github/oasis/elements/badges/processors/StreakNBadgeProcessor.java b/...adges/src/main/java/io/github/oasis/elements/badges/processors/StreakNBadgeProcessor.java
@@ -20,13 +20,13 @@
 package io.github.oasis.elements.badges.processors;
 
 import io.github.oasis.core.Event;
-import io.github.oasis.core.ID;
 import io.github.oasis.core.collect.Record;
 import io.github.oasis.core.context.ExecutionContext;
 import io.github.oasis.core.elements.RuleContext;
 import io.github.oasis.core.external.Db;
 import io.github.oasis.core.external.DbContext;
 import io.github.oasis.core.external.Sorted;
+import io.github.oasis.elements.badges.BadgeIDs;
 import io.github.oasis.elements.badges.rules.StreakNBadgeRule;
 import io.github.oasis.elements.badges.signals.BadgeRemoveSignal;
 import io.github.oasis.elements.badges.signals.BadgeSignal;
@@ -63,7 +63,7 @@ public StreakNBadgeProcessor(Db pool, RuleContext<StreakNBadgeRule> ruleContext)
 
     @Override
     public List<BadgeSignal> process(Event event, StreakNBadgeRule rule, ExecutionContext context, DbContext db) {
-        String key = ID.getUserBadgeStreakKey(event.getGameId(), event.getUser(), rule.getId());
+        String key = BadgeIDs.getUserBadgeStreakKey(event.getGameId(), event.getUser(), rule.getId());
         Sorted sortedRange = db.SORTED(key);
         long ts = event.getTimestamp();
         if (rule.getCriteria().matches(event, rule, context)) {