feat: Enhance billing and pricing

.run/Backend for E2E Billing.run.xml

@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Backend for E2E Billing" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="e2e,e2e-billing" />
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="tolgee-platform.server-app.main" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="io.tolgee.Application" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/Billing E2E.run.xml

@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Billing E2E" type="CompoundRunConfigurationType">
+    <toRun name="Run Dokcer E2E dependencies" type="GradleRunConfiguration" />
+    <toRun name="E2E tests (Billing)" type="js.build_tools.npm" />
+    <toRun name="Frontend for E2E tests" type="js.build_tools.npm" />
+    <toRun name="Backend for E2E Billing" type="SpringBootApplicationConfigurationType" />
+    <method v="2" />
+  </configuration>
+</component>

.run/E2E tests.run.xml

@@ -1,14 +1,14 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="E2E tests" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/e2e/package.json" />
+    <package-json value="$PROJECT_DIR$/public/e2e/package.json" />
     <command value="run" />
     <scripts>
       <script value="cy:open" />
     </scripts>
     <node-interpreter value="project" />
     <envs>
-      <env name="CYPRESS_HOST" value="http://localhost:8081" />
+      <env name="CYPRESS_HOST" value="http://localhost:8202" />
     </envs>
     <method v="2" />
   </configuration>
-</component>
+</component>

.run/Frontend for E2E tests.run.xml

@@ -1,15 +1,15 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Frontend for E2E tests" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/webapp/package.json" />
+    <package-json value="$PROJECT_DIR$/public/webapp/package.json" />
     <command value="run" />
     <scripts>
       <script value="start" />
     </scripts>
-    <arguments value="-- --port 8081 --host" />
+    <arguments value="-- --port 8202 --host --no-open" />
     <node-interpreter value="project" />
     <envs>
       <env name="VITE_APP_API_URL" value="http://localhost:8201" />
     </envs>
     <method v="2" />
   </configuration>
-</component>
+</component>

.run/Open E2E for Billing.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Open E2E for Billing" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/public" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-Dorg.gradle.daemon=false" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="openBillingE2eDev" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

.run/Public E2E.run.xml

@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Public E2E" type="CompoundRunConfigurationType">
+    <toRun name="Run Dokcer E2E dependencies" type="GradleRunConfiguration" />
+    <toRun name="E2E tests" type="js.build_tools.npm" />
+    <toRun name="Frontend for E2E tests" type="js.build_tools.npm" />
+    <toRun name="Backend for E2E tests" type="SpringBootApplicationConfigurationType" />
+    <method v="2" />
+  </configuration>
+</component>

.run/Run Dokcer E2E dependencies.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run Dokcer E2E dependencies" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/public" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-Dorg.gradle.daemon=false" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="runDockerE2eDev" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/suggestion/MtResultStreamer.kt

@@ -1,6 +1,6 @@
 package io.tolgee.api.v2.controllers.suggestion
 
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.databind.ObjectMapper
 import io.sentry.Sentry
 import io.tolgee.constants.MtServiceType
 import io.tolgee.dtos.cacheable.ProjectDto
@@ -144,7 +144,8 @@ class MtResultStreamer(
   }
 
   private fun OutputStreamWriter.writeJson(data: Any) {
-    this.write(jacksonObjectMapper().writeValueAsString(data) + "\n")
+    val string = objectMapper.writeValueAsString(data)
+    this.write(string + "\n")
     this.flush()
   }
 
@@ -166,6 +167,10 @@ class MtResultStreamer(
     mtService.getMtTranslator(projectHolder.project.id, false)
   }
 
+  private val objectMapper by lazy {
+    applicationContext.getBean(ObjectMapper::class.java)
+  }
+
   private val baseBlank by lazy {
     mtTranslator
       .getBaseTranslation(dto.keyId, dto.baseText)

backend/api/src/main/kotlin/io/tolgee/component/TestClockHeaderFilter.kt

@@ -0,0 +1,29 @@
+package io.tolgee.component
+
+import jakarta.servlet.FilterChain
+import jakarta.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletResponse
+import org.springframework.stereotype.Component
+import org.springframework.web.filter.OncePerRequestFilter
+
+@Component
+class TestClockHeaderFilter(
+  private val currentDateProvider: CurrentDateProvider,
+) : OncePerRequestFilter() {
+  companion object {
+    const val TOLGEE_TEST_CLOCK_HEADER_NAME = "X-Tolgee-Test-Clock"
+  }
+
+  override fun doFilterInternal(
+    request: HttpServletRequest,
+    response: HttpServletResponse,
+    filterChain: FilterChain,
+  ) {
+    response.addHeader(TOLGEE_TEST_CLOCK_HEADER_NAME, currentDateProvider.date.time.toString())
+    filterChain.doFilter(request, response)
+  }
+
+  override fun shouldNotFilter(request: HttpServletRequest): Boolean {
+    return currentDateProvider.forcedDate == null
+  }
+}

backend/api/src/main/kotlin/io/tolgee/hateoas/organization/PrivateOrganizationModel.kt

@@ -3,6 +3,7 @@ package io.tolgee.hateoas.organization
 import io.swagger.v3.oas.annotations.media.Schema
 import io.tolgee.constants.Feature
 import io.tolgee.hateoas.quickStart.QuickStartModel
+import io.tolgee.publicBilling.PublicCloudSubscriptionModel
 import org.springframework.hateoas.RepresentationModel
 import org.springframework.hateoas.server.core.Relation
 
@@ -14,4 +15,6 @@ open class PrivateOrganizationModel(
   val enabledFeatures: Array<Feature>,
   @get:Schema(example = "Quick start data for current user")
   val quickStart: QuickStartModel?,
+  @get:Schema(example = "Current active subscription info")
+  val activeCloudSubscription: PublicCloudSubscriptionModel?,
 ) : IOrganizationModel by organizationModel, RepresentationModel<PrivateOrganizationModel>()

backend/api/src/main/kotlin/io/tolgee/hateoas/organization/PrivateOrganizationModelAssembler.kt

@@ -3,12 +3,14 @@ package io.tolgee.hateoas.organization
 import io.tolgee.constants.Feature
 import io.tolgee.dtos.queryResults.organization.PrivateOrganizationView
 import io.tolgee.hateoas.quickStart.QuickStartModelAssembler
+import io.tolgee.publicBilling.CloudSubscriptionModelProvider
 import org.springframework.stereotype.Component
 
 @Component
 class PrivateOrganizationModelAssembler(
   private val organizationModelAssembler: OrganizationModelAssembler,
   private val quickStartModelAssembler: QuickStartModelAssembler,
+  private val cloudSubscriptionModelProvider: CloudSubscriptionModelProvider?,
 ) {
   fun toModel(
     view: PrivateOrganizationView,
@@ -18,6 +20,7 @@ class PrivateOrganizationModelAssembler(
       organizationModel = organizationModelAssembler.toModel(view.organization),
       enabledFeatures = features,
       quickStart = view.quickStart?.let { quickStartModelAssembler.toModel(it) },
+      activeCloudSubscription = cloudSubscriptionModelProvider?.provide(view.organization.id),
     )
   }
 }

backend/api/src/main/kotlin/io/tolgee/publicBilling/CloudSubscriptionModelProvider.kt

@@ -0,0 +1,5 @@
+package io.tolgee.publicBilling
+
+interface CloudSubscriptionModelProvider {
+  fun provide(organizationId: Long): PublicCloudSubscriptionModel?
+}

backend/api/src/main/kotlin/io/tolgee/publicBilling/PublicCloudSubscriptionModel.kt

@@ -0,0 +1,11 @@
+package io.tolgee.publicBilling
+
+import io.tolgee.api.SubscriptionStatus
+import io.tolgee.constants.BillingPeriod
+
+interface PublicCloudSubscriptionModel {
+  val currentBillingPeriod: BillingPeriod?
+  val cancelAtPeriodEnd: Boolean
+  val trialEnd: Long?
+  val status: SubscriptionStatus
+}

backend/app/src/main/kotlin/io/tolgee/ExceptionHandlers.kt

@@ -7,19 +7,16 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse
 import io.tolgee.constants.Message
 import io.tolgee.dtos.request.validators.ValidationErrorType
 import io.tolgee.dtos.request.validators.exceptions.ValidationException
-import io.tolgee.exceptions.BadRequestException
-import io.tolgee.exceptions.ErrorException
-import io.tolgee.exceptions.ErrorResponseBody
-import io.tolgee.exceptions.ErrorResponseTyped
-import io.tolgee.exceptions.NotFoundException
+import io.tolgee.exceptions.*
 import io.tolgee.security.ratelimit.RateLimitResponseBody
 import io.tolgee.security.ratelimit.RateLimitedException
+import io.tolgee.util.Logging
+import io.tolgee.util.logger
 import jakarta.persistence.EntityNotFoundException
 import jakarta.servlet.http.HttpServletRequest
 import org.apache.catalina.connector.ClientAbortException
 import org.apache.commons.lang3.exception.ExceptionUtils
 import org.hibernate.QueryException
-import org.slf4j.LoggerFactory
 import org.springframework.dao.InvalidDataAccessApiUsageException
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
@@ -42,9 +39,7 @@ import java.util.*
 import java.util.function.Consumer
 
 @RestControllerAdvice
-class ExceptionHandlers {
-  private val logger = LoggerFactory.getLogger(this::class.java)
-
+class ExceptionHandlers : Logging {
   @ExceptionHandler(MethodArgumentNotValidException::class)
   fun handleValidationExceptions(
     ex: MethodArgumentNotValidException,
@@ -164,6 +159,7 @@ class ExceptionHandlers {
   )
   @ExceptionHandler(ErrorException::class)
   fun handleServerError(ex: ErrorException): ResponseEntity<ErrorResponseBody> {
+    logger.debug("Exception with response status {} caught", ex.httpStatus, ex)
     return ResponseEntity(ex.errorResponseBody, ex.httpStatus)
   }
 

backend/app/src/main/kotlin/io/tolgee/configuration/FiltersConfiguration.kt

@@ -1,6 +1,7 @@
 package io.tolgee.configuration
 
 import io.tolgee.component.ExceptionHandlerFilter
+import io.tolgee.component.TestClockHeaderFilter
 import io.tolgee.component.VersionFilter
 import org.springframework.boot.autoconfigure.security.SecurityProperties
 import org.springframework.boot.web.servlet.FilterRegistrationBean
@@ -16,6 +17,12 @@ class FiltersConfiguration {
     return registration
   }
 
+  @Bean("filterRegistrationTestClockHeader")
+  fun testClockHeaderFilter(testClockHeaderFilter: TestClockHeaderFilter): FilterRegistrationBean<*> {
+    val registration = FilterRegistrationBean(testClockHeaderFilter)
+    return registration
+  }
+
   @Bean("filterRegistrationSecurityExceptionHandler")
   fun exceptionHandlerFilter(exceptionHandlerFilter: ExceptionHandlerFilter): FilterRegistrationBean<*> {
     val registration = FilterRegistrationBean(exceptionHandlerFilter)

backend/app/src/main/kotlin/io/tolgee/configuration/WebConfiguration.kt

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import io.tolgee.activity.ActivityHandlerInterceptor
+import io.tolgee.component.TestClockHeaderFilter
 import io.tolgee.component.VersionFilter
 import io.tolgee.configuration.tolgee.TolgeeProperties
 import jakarta.servlet.MultipartConfigElement
@@ -19,11 +20,7 @@ import org.springframework.http.CacheControl
 import org.springframework.scheduling.annotation.EnableAsync
 import org.springframework.scheduling.annotation.EnableScheduling
 import org.springframework.util.unit.DataSize
-import org.springframework.web.servlet.config.annotation.CorsRegistry
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
+import org.springframework.web.servlet.config.annotation.*
 import java.security.SecureRandom
 import java.util.concurrent.TimeUnit
 
@@ -55,7 +52,7 @@ class WebConfiguration(
   override fun addCorsMappings(registry: CorsRegistry) {
     registry.addMapping("/**")
       .allowedMethods("HEAD", "GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS")
-      .exposedHeaders(VersionFilter.TOLGEE_VERSION_HEADER_NAME)
+      .exposedHeaders(VersionFilter.TOLGEE_VERSION_HEADER_NAME, TestClockHeaderFilter.TOLGEE_TEST_CLOCK_HEADER_NAME)
   }
 
   override fun addInterceptors(registry: InterceptorRegistry) {

backend/app/src/main/resources/application-e2e.yaml

@@ -4,7 +4,7 @@ spring:
 tolgee:
   billing:
     enabled: false
-  frontend-url: http://localhost:8081
+  frontend-url: http://localhost:8202
   authentication:
     enabled: true
     needs-email-verification: true

backend/app/src/test/kotlin/io/tolgee/batch/BatchJobTestUtil.kt

@@ -400,7 +400,7 @@ class BatchJobTestUtil(
     waitForNotThrowing {
       // the project was unlocked before job2 acquired the job
       verify(batchJobProjectLockingManager, times(1)).unlockJobForProject(
-        ArgumentMatchers.eq(job.project.id),
+        ArgumentMatchers.eq(job.project?.id),
         ArgumentMatchers.eq(job.id),
       )
     }

backend/data/src/main/kotlin/io/tolgee/api/SubscriptionStatus.kt

@@ -8,6 +8,7 @@ enum class SubscriptionStatus(
   PAST_DUE(false),
   UNPAID(false),
   ERROR(false),
+  TRIALING(true),
 
   // might be stored on the EE side, but not license server (billing) side
   KEY_USED_BY_ANOTHER_INSTANCE(false),