Merge pull request #142 from mozilla-tw/prod-0.7

Prod 0.7
mozilla-tw · Oct 21, 2019 · c71fb1d · c71fb1d
2 parents c11ce4e + b8e980a
commit c71fb1d
Show file tree

Hide file tree

Showing 16 changed files with 82 additions and 28 deletions.
diff --git a/build.gradle b/build.gradle
@@ -94,12 +94,12 @@ dependencyManagement {
 
 // appengine versions for various environment
 def gaeVersions = [
-        dev: "0-5", stable: "0-5", nightly: "0-5", prod: 1
+        dev: "0-7", stable: "0-7", nightly: "0-7", prod: "0-7"
 ]
 
 ext.getDeployConfig = { ->
 
-    def mode = project.hasProperty('mode') ? project.property('mode') : "staging"
+    def mode = project.hasProperty('mode') ? project.property('mode') : "dev"
     def deployConfig = [mode: mode]
 
     if (mode == 'dev') {
@@ -118,7 +118,7 @@ ext.getDeployConfig = { ->
         deployConfig.promote = true
         deployConfig.version = gaeVersions.nightly
     } else if (mode == 'prod') {
-        deployConfig.gaeProjId = "rocket"
+        deployConfig.gaeProjId = "zerda-dcf76"
         deployConfig.stopPreviousVersion = false
         deployConfig.promote = false
         deployConfig.version = gaeVersions.prod

diff --git a/src/main/java/org/mozilla/msrp/platform/common/MessageSource.kt b/src/main/java/org/mozilla/msrp/platform/common/MessageSource.kt
@@ -0,0 +1,21 @@
+package org.mozilla.msrp.platform.common
+
+import org.springframework.context.MessageSource
+import org.springframework.context.NoSuchMessageException
+import java.util.*
+
+fun MessageSource.getMessageOrNull(id: String, locale: Locale, vararg args: String = emptyArray()): String? {
+    return try {
+        getMessage(id, args, locale)
+    } catch (e: NoSuchMessageException){
+        null
+    }
+}
+
+fun MessageSource.getMessageOrEmpty(id: String, locale: Locale, vararg args: String = emptyArray()): String {
+    return try {
+        getMessage(id, args, locale)
+    } catch (e: NoSuchMessageException){
+        ""
+    }
+}
diff --git a/src/main/java/org/mozilla/msrp/platform/mission/MissionController.java b/src/main/java/org/mozilla/msrp/platform/mission/MissionController.java
@@ -135,6 +135,7 @@ public ResponseEntity createMissionForm(
             @RequestParam String joinStartDate,
             @RequestParam String joinEndDate,
             @RequestParam String expiredDate,
+            @RequestParam String redeemEndDate,
             @RequestParam String pings,
             @RequestParam(value = "messages[]") String[] messages,
             @RequestParam int minVersion) {
@@ -168,6 +169,7 @@ public ResponseEntity createMissionForm(
                 joinStartDate,
                 joinEndDate,
                 expiredDate,
+                redeemEndDate,
                 minVersion,
                 params,
                 rewardType,

diff --git a/src/main/java/org/mozilla/msrp/platform/mission/MissionCreateRequest.kt b/src/main/java/org/mozilla/msrp/platform/mission/MissionCreateRequest.kt
@@ -14,6 +14,7 @@ data class MissionCreateData(
         val joinStartDate: String,
         val joinEndDate: String,
         val expiredDate: String,
+        val redeemEndDate: String,
         val minVersion: Int,
         val missionParams: Map<String, Any>?,
         val rewardType: String,

diff --git a/src/main/java/org/mozilla/msrp/platform/mission/MissionCreateResult.kt b/src/main/java/org/mozilla/msrp/platform/mission/MissionCreateResult.kt
@@ -13,6 +13,7 @@ data class MissionCreateResultItem(
         val joinStartDate: String,
         val joinEndDate: String,
         val expiredDate: String,
+        val redeemEndDate: String,
         val events: List<String>,
         val endpoint: String,
         val minVersion: Int,

diff --git a/src/main/java/org/mozilla/msrp/platform/mission/MissionDoc.kt b/src/main/java/org/mozilla/msrp/platform/mission/MissionDoc.kt
@@ -27,6 +27,7 @@ data class MissionDoc(
         val joinStartDate: String = "",
         val joinEndDate: String = "",
         var expiredDate: String = "",
+        var redeemEndDate: String = "",
         var minVersion: Int = 0,
         val missionParams: Map<String, Any> = emptyMap(),
         var rewardType: String = "", // the Firestore collection for reward inventory

diff --git a/src/main/java/org/mozilla/msrp/platform/mission/MissionListItem.kt b/src/main/java/org/mozilla/msrp/platform/mission/MissionListItem.kt
@@ -16,11 +16,13 @@ data class MissionListItem(
         val redeemEndpoint: String,
         val events: List<String>,
         val expiredDate: Long,
+        val redeemEndDate: Long,
         val status: JoinStatus,
         val minVersion: Int,
         var progress: Map<String, Any>,
         val important: Boolean,
         val missionType: String,
         val joinEndDate: Long,
-        val imageUrl: String
+        val imageUrl: String,
+        val rewardExpiredDate: Long
 )
diff --git a/src/main/java/org/mozilla/msrp/platform/mission/MissionRepositoryFirestore.kt b/src/main/java/org/mozilla/msrp/platform/mission/MissionRepositoryFirestore.kt
@@ -69,6 +69,7 @@ class MissionRepositoryFirestore @Inject internal constructor(
                 joinStartDate = createData.joinStartDate,
                 joinEndDate = createData.joinEndDate,
                 expiredDate = createData.expiredDate,
+                redeemEndDate = createData.redeemEndDate,
                 interestPings = createData.pings,
                 minVersion = createData.minVersion,
                 missionParams = createData.missionParams ?: emptyMap(),

diff --git a/src/main/java/org/mozilla/msrp/platform/mission/MissionService.kt b/src/main/java/org/mozilla/msrp/platform/mission/MissionService.kt
@@ -1,13 +1,15 @@
 package org.mozilla.msrp.platform.mission
 
+import org.mozilla.msrp.platform.common.getMessageOrEmpty
+import org.mozilla.msrp.platform.common.getMessageOrNull
 import org.mozilla.msrp.platform.common.isProd
 import org.mozilla.msrp.platform.firestore.stringToLocalDateTime
 import org.mozilla.msrp.platform.mission.qualifier.MissionProgressDoc
 import org.mozilla.msrp.platform.mission.qualifier.MissionQualifier
+import org.mozilla.msrp.platform.redward.RewardRepository
 import org.mozilla.msrp.platform.util.logger
 import org.slf4j.Logger
 import org.springframework.context.MessageSource
-import org.springframework.context.NoSuchMessageException
 import org.springframework.core.env.Environment
 import org.springframework.http.HttpStatus
 import java.time.Clock
@@ -21,7 +23,8 @@ import javax.inject.Named
 
 @Named
 class MissionService @Inject constructor(
-        private val missionRepository: MissionRepository
+        private val missionRepository: MissionRepository,
+        private val rewardRepository: RewardRepository
 ) {
 
     // TODO: Verify user status
@@ -129,13 +132,7 @@ class MissionService @Inject constructor(
     }
 
     private fun hasString(resId: String): Boolean {
-        return try {
-            getStringById(resId, Locale.getDefault())
-            true
-
-        } catch (e: NoSuchMessageException) {
-            false
-        }
+        return missionMessageSource.getMessageOrNull(resId, Locale.getDefault()) != null
     }
 
     private fun getMissionTitle(mission: MissionDoc, locale: Locale): String {
@@ -151,11 +148,8 @@ class MissionService @Inject constructor(
         val name = getMissionTitle(missionDoc, locale)
         val description = getStringById(missionDoc.descriptionId, locale)
 
-        val joinStatus = missionRepository.getJoinStatus(
-                uid,
-                missionDoc.missionType,
-                missionDoc.mid
-        )?.let { it } ?: JoinStatus.New
+        val joinDoc = missionRepository.getMissionJoinDoc(uid, missionDoc.missionType, missionDoc.mid)
+        val joinStatus = joinDoc?.status?.let { it } ?: JoinStatus.New
 
         val progress = missionQualifier.getProgress(
                 uid,
@@ -167,14 +161,21 @@ class MissionService @Inject constructor(
 
         val expiredInstant: Instant
         val joinEndInstant: Instant
+        val redeemEndInstant: Instant
         if (missionDoc.isUtcBasedMission()) {
             expiredInstant = stringToLocalDateTime(missionDoc.expiredDate).toInstant(ZoneOffset.UTC)
             joinEndInstant = stringToLocalDateTime(missionDoc.joinEndDate).toInstant(ZoneOffset.UTC)
+            redeemEndInstant = stringToLocalDateTime(missionDoc.redeemEndDate).toInstant(ZoneOffset.UTC)
         } else {
             expiredInstant = stringToLocalDateTime(missionDoc.expiredDate).atZone(zone).toInstant()
             joinEndInstant = stringToLocalDateTime(missionDoc.joinEndDate).atZone(zone).toInstant()
+            redeemEndInstant = stringToLocalDateTime(missionDoc.redeemEndDate).atZone(zone).toInstant()
         }
 
+        val rewardExpiredDate = joinDoc?.rewardDocId?.let { rewardDocId ->
+            rewardRepository.getRewardExpiredDate(missionDoc.rewardType, rewardDocId)
+        } ?: Long.MIN_VALUE
+
         return MissionListItem(
                 mid = missionDoc.mid,
                 title = name,
@@ -183,13 +184,15 @@ class MissionService @Inject constructor(
                 redeemEndpoint = "/api/v1/redeem/${missionDoc.missionType}?mid=${missionDoc.mid}",
                 events = missionDoc.interestPings,
                 expiredDate = expiredInstant.toEpochMilli(),
+                redeemEndDate = redeemEndInstant.toEpochMilli(),
                 status = joinStatus,
                 minVersion = missionDoc.minVersion,
                 progress = progress?.toProgressResponse() ?: emptyMap(),
                 important = important,
                 missionType = missionDoc.missionType,
                 joinEndDate = joinEndInstant.toEpochMilli(),
-                imageUrl = missionDoc.imageUrl
+                imageUrl = missionDoc.imageUrl,
+                rewardExpiredDate = rewardExpiredDate
         )
     }
 
@@ -198,8 +201,8 @@ class MissionService @Inject constructor(
      * @param id string id
      * @return localized string (if any)
      */
-    private fun getStringById(id: String, locale: Locale, vararg args: String = emptyArray()): String {
-        return missionMessageSource.getMessage(id, args, locale)
+    private fun getStringById(id: String, locale: Locale): String {
+        return missionMessageSource.getMessageOrEmpty(id, locale)
     }
 
     fun createMissions(missionList: List<MissionCreateData>): MissionCreateResult {
@@ -222,6 +225,7 @@ class MissionService @Inject constructor(
                     joinStartDate = mission.joinStartDate,
                     joinEndDate = mission.joinEndDate,
                     expiredDate = mission.expiredDate,
+                    redeemEndDate = mission.redeemEndDate,
                     events = mission.interestPings,
                     endpoint = mission.endpoint,
                     minVersion = mission.minVersion,

diff --git a/src/main/java/org/mozilla/msrp/platform/mission/qualifier/DailyMissionQualifier.kt b/src/main/java/org/mozilla/msrp/platform/mission/qualifier/DailyMissionQualifier.kt
@@ -1,5 +1,6 @@
 package org.mozilla.msrp.platform.mission.qualifier
 
+import org.mozilla.msrp.platform.common.getMessageOrEmpty
 import org.mozilla.msrp.platform.common.isProd
 import org.mozilla.msrp.platform.mission.JoinStatus
 import org.mozilla.msrp.platform.mission.MissionRepository
@@ -50,7 +51,7 @@ class DailyMissionQualifier(private val clock: Clock = Clock.systemUTC()) {
             val messages = params["message"] as? ArrayList<*>
             val messageId = messages?.getOrNull(newProgress.currentDayCount - 1)
             val message = messageId?.let {
-                missionMessageSource.getMessage(it.toString(), null, locale)
+                missionMessageSource.getMessageOrEmpty(it.toString(), locale)
             }
             newProgress.dailyMessage = message ?: ""
             newProgress.totalDays = totalDays

diff --git a/src/main/java/org/mozilla/msrp/platform/redward/RewardRepository.kt b/src/main/java/org/mozilla/msrp/platform/redward/RewardRepository.kt
@@ -138,6 +138,11 @@ open class RewardRepository @Inject constructor(
         }
     }
 
+    fun getRewardExpiredDate(rewardType: String, rewardDocId: String): Long? {
+        val doc = getRewardDoc(rewardType, rewardDocId)
+        return doc?.expire_date
+    }
+
     private fun info(missionJoinDoc: MissionJoinDoc) =
             "[INFO: mission ${missionJoinDoc.mid}, user ${missionJoinDoc.uid}]"
 

diff --git a/src/main/java/org/mozilla/msrp/platform/user/FirefoxAccountClientConfiguration.java b/src/main/java/org/mozilla/msrp/platform/user/FirefoxAccountClientConfiguration.java
@@ -7,11 +7,14 @@
 import retrofit2.Retrofit;
 import retrofit2.converter.jackson.JacksonConverterFactory;
 
+import javax.inject.Inject;
 import javax.inject.Named;
 
 @Log4j2
 @Named
 public class FirefoxAccountClientConfiguration {
+    @Inject
+    FirefoxAccountServiceInfo firefoxAccountServiceInfo;
 
 
     @Bean("FxaAuth")
@@ -24,7 +27,7 @@ public FirefoxAccountClient authFirefoxAccountClient() {
 
 
         return new Retrofit.Builder()
-                .baseUrl("https://oauth-stable.dev.lcip.org")
+                .baseUrl(firefoxAccountServiceInfo.getApiToken())
                 .client(client)
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build()
@@ -40,7 +43,7 @@ public FirefoxAccountClient profileFirefoxAccountClientFactory() {
 
 
         return new Retrofit.Builder()
-                .baseUrl("https://stable.dev.lcip.org/profile/")
+                .baseUrl(firefoxAccountServiceInfo.getApiProfile())
                 .client(client)
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build().create(FirefoxAccountClient.class);

diff --git a/src/main/java/org/mozilla/msrp/platform/user/FirefoxAccountConfiguration.java b/src/main/java/org/mozilla/msrp/platform/user/FirefoxAccountConfiguration.java
@@ -32,7 +32,7 @@ public FirefoxAccountServiceInfo firefoxAccountServiceInfo(Firestore firestore)
                 String token = document.getString("fxa_api_token");
                 String profile = document.getString("fxa_api_profile");
 
-                log.info("Get FirefoxAccount settings --- success ---");
+                log.info("Get FirefoxAccount settings --- success ---:" + id);
                 return new FirefoxAccountServiceInfo(id, secret, token, profile);
             }
         } catch (InterruptedException | ExecutionException e) {

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -49,7 +49,7 @@ logging.level:
   root: WARN
   org.mozilla.msrp: INFO
 platform:
-  firebaseProjectId: rocket
+  firebaseProjectId: zerda-dcf76
 news:
   cache-size: 100
   cache-ttl: 15
diff --git a/src/main/resources/templates/msrp.html b/src/main/resources/templates/msrp.html
@@ -110,6 +110,16 @@ <h1>Create Mission</h1>
             </td>
             <td>
                 <input type="text" name="expiredDate">2019-12-30T10:00:00, After this moment, those didn't join nor complete the mission will not see this mission anymore
+            </td>
+        </tr>
+        <tr>
+            <td>
+                redeemEndDate
+            </td>
+            <td>
+                <input type="text" name="redeemEndDate">2019-12-30T10:00:00, After this moment, reward can't be redeemed
+            </td>
+        </tr>
         <tr>
             <td>
                 pings
@@ -241,7 +251,7 @@ <h1>Upload Reward</h1>
             <td>
                 expiredDate
             </td>
-            <td><input type="text" name="expiredDate">After this moment, user won't be able to redeem this coupon
+            <td><input type="text" name="expiredDate">After this moment, user won't be able to use this coupon
             </td>
         </tr>
         <tr>

diff --git a/src/test/java/org/mozilla/msrp/platform/mission/MissionJoinableTest.kt b/src/test/java/org/mozilla/msrp/platform/mission/MissionJoinableTest.kt
@@ -3,6 +3,7 @@ package org.mozilla.msrp.platform.mission
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.mockito.Mockito.mock
+import org.mozilla.msrp.platform.redward.RewardRepository
 import java.time.Clock
 import java.time.Instant
 import java.time.LocalDateTime
@@ -26,7 +27,8 @@ class MissionJoinableTest {
     private val afterExpiredUtc = LocalDateTime.ofInstant(afterExpiredJakarta.atZone(zoneJakarta).toInstant(), zoneUtc)
 
     private val missionRepo = mock(MissionRepository::class.java)
-    private val service = MissionService(missionRepo)
+    private val rewardRepo = mock(RewardRepository::class.java)
+    private val service = MissionService(missionRepo, rewardRepo)
 
     @Test
     fun `test getMissionJoinState()`() {