Merge branch 'main' into model-ad/MG-557-add-pagination

Author: sagely1

apps/bixarena/app/.env.example

@@ -14,5 +14,5 @@ PROMPT_LEN_LIMIT=5000
 APP_BRAND_URL=https://sagebionetworks.org
 APP_CONTACT_URL=https://sagebionetworks.org/contact
 APP_ISSUE_URL="https://forms.gle/WsvSdEfv5MfFpeedA"
-APP_TOS_URL=
+APP_TOS_URL=https://sagebionetworks.org/trust-center
 APP_VERSION=1.0.0

apps/model-ad/api-next/.env.example

@@ -1,7 +1,10 @@
 SERVER_PORT="3334"
-MODEL_AD_MONGO_HOST="model-ad-mongo"
-MODEL_AD_MONGO_PORT="27017"
-MODEL_AD_MONGO_DATABASE="model-ad"
-MODEL_AD_MONGO_USERNAME="root"
-MODEL_AD_MONGO_PASSWORD="changeme"
-MODEL_AD_MONGO_AUTH_DB="admin"
+SPRING_DATA_MONGODB_HOST="model-ad-mongo"
+SPRING_DATA_MONGODB_PORT="27017"
+SPRING_DATA_MONGODB_DATABASE="model-ad"
+SPRING_DATA_MONGODB_USERNAME="root"
+SPRING_DATA_MONGODB_PASSWORD="changeme"
+SPRING_DATA_MONGODB_AUTHENTICATION_DATABASE="admin"
+
+# Environment name (dev, stage, prod)
+SPRING_PROFILES_ACTIVE=dev

apps/model-ad/api-next/src/main/resources/application-dev.yml

@@ -0,0 +1,4 @@
+# Development profile configuration
+logging:
+  level:
+    org.sagebionetworks.model.ad: DEBUG

apps/model-ad/api-next/src/main/resources/application-prod.yml

@@ -0,0 +1,4 @@
+# Production profile configuration
+logging:
+  level:
+    org.sagebionetworks.model.ad: WARN

apps/model-ad/api-next/src/main/resources/application-stage.yml

@@ -0,0 +1,4 @@
+# Staging profile configuration
+logging:
+  level:
+    org.sagebionetworks.model.ad: INFO

apps/model-ad/api-next/src/main/resources/application.yml

@@ -1,17 +1,17 @@
 server:
-  port: ${SERVER_PORT:3334}
+  port: 3334
 
 spring:
   application:
     name: model-ad-api-next
   data:
     mongodb:
-      host: ${MODEL_AD_MONGO_HOST:model-ad-mongo}
-      port: ${MODEL_AD_MONGO_PORT:27017}
-      database: ${MODEL_AD_MONGO_DATABASE:model-ad}
-      username: ${MODEL_AD_MONGO_USERNAME:root}
-      password: ${MODEL_AD_MONGO_PASSWORD:changeme}
-      authentication-database: ${MODEL_AD_MONGO_AUTH_DB:admin}
+      host: model-ad-mongo
+      port: 27017
+      database: model-ad
+      username: root
+      password: changeme
+      authentication-database: admin
   jackson:
     date-format: org.sagebionetworks.model.ad.api.next.RFC3339DateFormat
     serialization: