build: Globally skip the server build (#2165)

tolgee · Apr 12, 2024 · 64bc2b2 · 64bc2b2
1 parent 4122afe
commit 64bc2b2
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 20 deletions.
diff --git a/backend/app/build.gradle b/backend/app/build.gradle
@@ -233,7 +233,6 @@ bootJar {
     manifest {
         attributes('Implementation-Version': project.version)
     }
-    onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
 }
 
 def unpackTarget = "build/dependency"
@@ -254,11 +253,6 @@ task addVersionFile(type: Task) {
     }
 }
 
-project.tasks.findByName("compileKotlin").onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
-project.tasks.findByName("bootBuildInfo").onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
-project.tasks.findByName("compileJava").onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
-project.tasks.findByName("bootJarMainClassName")?.onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
-
 sourceSets {
     main.kotlin.srcDirs = ['src/main/kotlin', 'src/main/java']
     test.kotlin.srcDirs = ['src/test/kotlin', 'src/test/java']

diff --git a/backend/data/build.gradle b/backend/data/build.gradle
@@ -204,10 +204,6 @@ test {
     maxHeapSize = "4096m"
 }
 
-project.tasks.findByName("compileKotlin").onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
-project.tasks.findByName("compileJava").onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
-project.tasks.findByName("bootJarMainClassName")?.onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
-
 sourceSets {
     main.kotlin.srcDirs = ['src/main/kotlin', 'src/main/java']
     test.kotlin.srcDirs = ['src/test/kotlin', 'src/test/java']

diff --git a/backend/data/src/main/kotlin/io/tolgee/component/reporting/BusinessEventReporter.kt b/backend/data/src/main/kotlin/io/tolgee/component/reporting/BusinessEventReporter.kt
@@ -5,6 +5,7 @@ import io.tolgee.dtos.cacheable.UserAccountDto
 import io.tolgee.service.organization.OrganizationService
 import io.tolgee.service.project.ProjectService
 import io.tolgee.service.security.UserAccountService
+import jakarta.persistence.EntityManager
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Lazy
 import org.springframework.context.event.EventListener
@@ -17,6 +18,7 @@ class BusinessEventReporter(
   private val projectService: ProjectService,
   private val organizationService: OrganizationService,
   private val userAccountService: UserAccountService,
+  private val entityManager: EntityManager,
 ) {
   @Lazy
   @Autowired
@@ -109,12 +111,27 @@ class BusinessEventReporter(
     val projectDto = data.projectDto ?: data.projectId?.let { projectService.findDto(it) }
     val organizationId = data.organizationId ?: projectDto?.organizationOwnerId
     val organizationName = data.organizationName ?: organizationId?.let { organizationService.get(it).name }
-    val userAccountDto = data.userAccountDto ?: data.userAccountId?.let { userAccountService.findDto(it) }
+    val userAccountId = data.userAccountId ?: findOwnerUserByOrganizationId(organizationId)
+    val userAccountDto = data.userAccountDto ?: userAccountId?.let { userAccountService.findDto(it) }
     return data.copy(
       projectDto = projectDto,
       organizationId = organizationId,
       organizationName = organizationName,
       userAccountDto = userAccountDto,
     )
   }
+
+  private fun findOwnerUserByOrganizationId(organizationId: Long?): Long? {
+    organizationId ?: return null
+    return entityManager.createQuery(
+      """
+      select u.id from UserAccount u 
+      join u.organizationRoles orl on orl.organization.id = :organizationId
+      where orl.type = io.tolgee.model.enums.OrganizationRoleType.OWNER
+      order by u.id
+      limit 1
+    """,
+      Long::class.java,
+    ).setParameter("organizationId", organizationId).resultList.firstOrNull()
+  }
 }
diff --git a/backend/development/build.gradle b/backend/development/build.gradle
@@ -74,10 +74,6 @@ dependencies {
     implementation libs.kotlinCoroutines
 }
 
-
-project.tasks.findByName("compileKotlin").onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
-project.tasks.findByName("compileJava").onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
-
 sourceSets {
     main.kotlin.srcDirs = ['src/main/kotlin', 'src/main/java']
     test.kotlin.srcDirs = ['src/test/kotlin', 'src/test/java']

diff --git a/backend/testing/build.gradle b/backend/testing/build.gradle
@@ -125,10 +125,6 @@ test {
     maxHeapSize = "4096m"
 }
 
-project.tasks.findByName("compileKotlin").onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
-project.tasks.findByName("compileJava").onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
-project.tasks.findByName("bootJarMainClassName")?.onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
-
 sourceSets {
     main.kotlin.srcDirs = ['src/main/kotlin', 'src/main/java']
     test.kotlin.srcDirs = ['src/test/kotlin', 'src/test/java']

diff --git a/build.gradle b/build.gradle
@@ -137,6 +137,20 @@ ktlint {
     verbose = true
 }
 
+rootProject.subprojects {
+    afterEvaluate {
+        tasks.findByName("compileKotlin")?.onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
+        tasks.findByName("bootBuildInfo")?.onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
+        tasks.findByName("compileJava")?.onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
+        tasks.findByName("bootJarMainClassName")?.onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
+        tasks.findByName("jar")?.onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
+        tasks.findByName("bootJar")?.onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
+        tasks.findByName("classes")?.onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
+        tasks.findByName("classes")?.onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
+        tasks.findByName("compileTestKotlin")?.onlyIf { System.getenv("SKIP_SERVER_BUILD") != "true" }
+    }
+}
+
 subprojects {
     task allDeps(type: DependencyReportTask) {}
     ext['hibernate.version'] = hibernateVersion

diff --git a/ee/backend/app/build.gradle b/ee/backend/app/build.gradle
@@ -78,7 +78,6 @@ dependencies {
     liquibaseRuntime libs.liquibaseHibernate
     liquibaseRuntime libs.kotlinReflect
     liquibaseRuntime(project(":data"))
-
     liquibaseRuntime sourceSets.main.output
     liquibaseRuntime 'org.springframework.boot:spring-boot-starter-data-jpa'
 }