Use correct config loading in feed-service

backend-services/feed-service/app/models/DailyQuestion.scala

@@ -7,7 +7,7 @@ import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.{Future, Await}
 import scala.concurrent.duration._
 
-import com.typesafe.config.ConfigFactory
+import utils.ConfigHelper
 
 import org.bson.types.ObjectId
 import java.util.Date
@@ -86,8 +86,8 @@ object DailyQuestion {
     }
 
     def getRandomTime(): Date = {
-        val minHour = ConfigFactory.load().getInt("dailyQuestions.min.hour")
-        val maxHour = ConfigFactory.load().getInt("dailyQuestions.max.hour")
+        val minHour = ConfigHelper.getInt("dailyQuestions.min.hour")
+        val maxHour = ConfigHelper.getInt("dailyQuestions.max.hour")
 
         val randomHour = Random.between(minHour, maxHour + 1)
         val randomMinute = Random.between(0, 60)

backend-services/feed-service/app/models/User.scala

@@ -4,7 +4,7 @@ import models.HttpCall
 
 import play.api.libs.json.JsValue
 
-import com.typesafe.config.ConfigFactory
+import utils.ConfigHelper
 import org.bson.types.ObjectId
 
 import scala.concurrent.Future
@@ -13,7 +13,7 @@ import scala.concurrent.ExecutionContext.Implicits.global
 
 object User {
     def getUserFriends(userId: ObjectId, jwt: String): Future[Seq[ObjectId]] = {
-        val friendServiceUri: String = ConfigFactory.load().getString("friend.service.uri")
+        val friendServiceUri: String = ConfigHelper.getString("friend.service.uri")
 
         val url: String = s"${friendServiceUri}friends"
         val queryStringParameters: Seq[(String, String)] = Seq(("userId", userId.toString()))
@@ -27,7 +27,7 @@ object User {
     }
 
     def userExists(userId: ObjectId, jwt: String): Future[Boolean] = {
-        val userServiceUri: String = ConfigFactory.load().getString("user.service.uri")
+        val userServiceUri: String = ConfigHelper.getString("user.service.uri")
 
         val url: String = s"${userServiceUri}test/verifyUser"
         val queryStringParameters: Seq[(String, String)] = Seq(("userId", userId.toString()))

backend-services/feed-service/app/models/actions/AuthenticationRequest.scala

 package models.actions
 
-import com.typesafe.config.ConfigFactory
+import utils.ConfigHelper
 
 import play.api.mvc.{ActionTransformer, Request, WrappedRequest}
 
@@ -41,7 +41,7 @@ class AuthenticationTransformer @Inject() (implicit val executionContext: Execut
      * @return The user ID specified in the JWT's payload.
      */
     def processJWT[A](request: Request[A]): (String, Option[ObjectId], Boolean) = {
-        val privateKey = ConfigFactory.load().getString("jwt.privateKey")
+        val privateKey = ConfigHelper.getString("jwt.privateKey")
 
         try {
             val authHeader = request.headers.get("Authorization").get

backend-services/feed-service/app/repositories/DailyQuestionRepository.scala

@@ -3,7 +3,7 @@ package repositories
 import models.DailyQuestion
 import utils.MongoConnection
 
-import com.typesafe.config.ConfigFactory
+import utils.ConfigHelper
 import org.bson.types.ObjectId
 
 import scala.concurrent.ExecutionContext.Implicits.global
@@ -11,8 +11,8 @@ import scala.concurrent.Future
 
 
 class DailyQuestionRepository extends Repository[DailyQuestion] (
-    ConfigFactory.load().getString("mongo.questionService.db"),
-    ConfigFactory.load().getString("mongo.dailyQuestions.collection")
+    ConfigHelper.getString("mongo.questionService.db"),
+    ConfigHelper.getString("mongo.dailyQuestions.collection")
 ) {
     /**
      * Inserts a DailyQuestion record into the database.

backend-services/feed-service/app/repositories/DailyRepository.scala

@@ -3,7 +3,7 @@ package repositories
 import models.Daily
 import utils.MongoConnection
 
-import com.typesafe.config.ConfigFactory
+import utils.ConfigHelper
 import org.bson.types.ObjectId
 
 import scala.concurrent.ExecutionContext.Implicits.global
@@ -11,8 +11,8 @@ import scala.concurrent.Future
 
 
 class DailyRepository extends Repository[Daily] (
-    ConfigFactory.load().getString("mongo.feedService.db"),
-    ConfigFactory.load().getString("mongo.dailies.collection")
+    ConfigHelper.getString("mongo.feedService.db"),
+    ConfigHelper.getString("mongo.dailies.collection")
 ) {
     /**
      * Inserts a Daily record into the database.

backend-services/feed-service/app/repositories/QuestionRepository.scala

@@ -3,7 +3,7 @@ package repositories
 import models.Question
 import utils.MongoConnection
 
-import com.typesafe.config.ConfigFactory
+import utils.ConfigHelper
 import org.bson.types.ObjectId
 
 import scala.concurrent.ExecutionContext.Implicits.global
@@ -11,8 +11,8 @@ import scala.concurrent.Future
 
 
 class QuestionRepository extends Repository[Question] (
-    ConfigFactory.load().getString("mongo.questionService.db"),
-    ConfigFactory.load().getString("mongo.questions.collection")
+    ConfigHelper.getString("mongo.questionService.db"),
+    ConfigHelper.getString("mongo.questions.collection")
 ) {
     /**
      * Inserts a Question record into the database.

backend-services/feed-service/app/utils/ConfigHelper.scala

@@ -6,5 +6,6 @@ object ConfigHelper {
   private val applicationConfig: Config = ConfigFactory.load("application.conf")
 
   def getString(key: String): String = applicationConfig.getString(key)
+  def getInt(key: String): Int = applicationConfig.getInt(key)
   def getBoolean(key: String): Boolean = applicationConfig.getBoolean(key)
 }