-
-
Notifications
You must be signed in to change notification settings - Fork 184
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
23 changed files
with
330 additions
and
126 deletions.
There are no files selected for viewing
39 changes: 39 additions & 0 deletions
39
backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/BusinessEventController.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
package io.tolgee.api.v2.controllers | ||
|
||
import io.sentry.Sentry | ||
import io.swagger.v3.oas.annotations.Operation | ||
import io.swagger.v3.oas.annotations.tags.Tag | ||
import io.tolgee.component.reporting.BusinessEventPublisher | ||
import io.tolgee.dtos.request.BusinessEventReportRequest | ||
import io.tolgee.service.organization.OrganizationRoleService | ||
import io.tolgee.service.security.SecurityService | ||
import io.tolgee.util.Logging | ||
import io.tolgee.util.logger | ||
import org.springframework.web.bind.annotation.CrossOrigin | ||
import org.springframework.web.bind.annotation.PostMapping | ||
import org.springframework.web.bind.annotation.RequestBody | ||
import org.springframework.web.bind.annotation.RequestMapping | ||
import org.springframework.web.bind.annotation.RestController | ||
|
||
@RestController | ||
@CrossOrigin(origins = ["*"]) | ||
@RequestMapping(value = ["/v2/business-events"]) | ||
@Tag(name = "Reports business events from frontend app") | ||
class BusinessEventController( | ||
private val businessEventPublisher: BusinessEventPublisher, | ||
private val securityService: SecurityService, | ||
private val organizationRoleService: OrganizationRoleService, | ||
) : Logging { | ||
@PostMapping("/report") | ||
@Operation(summary = "Reports business event") | ||
fun report(@RequestBody eventData: BusinessEventReportRequest) { | ||
try { | ||
eventData.projectId?.let { securityService.checkAnyProjectPermission(it) } | ||
eventData.organizationId?.let { organizationRoleService.checkUserCanView(it) } | ||
businessEventPublisher.publish(eventData) | ||
} catch (e: Throwable) { | ||
logger.error("Error storing event", e) | ||
Sentry.captureException(e) | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 0 additions & 46 deletions
46
backend/api/src/main/kotlin/io/tolgee/component/UtmReportingFilter.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/BusinessEventControllerTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
package io.tolgee.api.v2.controllers | ||
|
||
import com.posthog.java.PostHog | ||
import io.tolgee.ProjectAuthControllerTest | ||
import io.tolgee.development.testDataBuilder.data.BaseTestData | ||
import io.tolgee.fixtures.AuthorizedRequestFactory | ||
import io.tolgee.fixtures.andIsOk | ||
import io.tolgee.fixtures.waitForNotThrowing | ||
import io.tolgee.testing.annotations.ProjectJWTAuthTestMethod | ||
import io.tolgee.testing.assert | ||
import org.junit.jupiter.api.BeforeEach | ||
import org.junit.jupiter.api.Test | ||
import org.mockito.kotlin.any | ||
import org.mockito.kotlin.argThat | ||
import org.mockito.kotlin.eq | ||
import org.mockito.kotlin.times | ||
import org.mockito.kotlin.verify | ||
import org.springframework.beans.factory.annotation.Autowired | ||
import org.springframework.boot.test.mock.mockito.MockBean | ||
import org.springframework.http.HttpHeaders | ||
|
||
class BusinessEventControllerTest : ProjectAuthControllerTest("/v2/projects/") { | ||
private lateinit var testData: BaseTestData | ||
|
||
@MockBean | ||
@Autowired | ||
lateinit var postHog: PostHog | ||
|
||
@BeforeEach | ||
fun setup() { | ||
testData = BaseTestData() | ||
testDataService.saveTestData(testData.root) | ||
projectSupplier = { testData.projectBuilder.self } | ||
userAccount = testData.user | ||
} | ||
|
||
@Test | ||
@ProjectJWTAuthTestMethod | ||
fun `it publishes business event to external monitor`() { | ||
performPost( | ||
"/v2/business-events/report", | ||
mapOf( | ||
"eventName" to "TEST_EVENT", | ||
"organizationId" to testData.userAccountBuilder.defaultOrganizationBuilder.self.id, | ||
"projectId" to testData.projectBuilder.self.id, | ||
"data" to mapOf("test" to "test") | ||
), | ||
HttpHeaders().also { | ||
it["Authorization"] = listOf(AuthorizedRequestFactory.getBearerTokenString(generateJwtToken(userAccount!!.id))) | ||
it["X-Tolgee-Utm"] = "eyJ1dG1faGVsbG8iOiJoZWxsbyJ9" | ||
} | ||
).andIsOk | ||
|
||
var params: Map<String, Any?>? = null | ||
waitForNotThrowing(timeout = 10000) { | ||
verify(postHog, times(1)).capture( | ||
any(), eq("TEST_EVENT"), | ||
argThat { | ||
params = this | ||
true | ||
} | ||
) | ||
} | ||
params!!["utm_hello"].assert.isEqualTo("hello") | ||
params!!["organizationId"].assert.isNotNull | ||
params!!["organizationName"].assert.isEqualTo("test_username") | ||
params!!["utm_hello"].assert.isEqualTo("hello") | ||
params!!["test"].assert.isEqualTo("test") | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 1 addition & 8 deletions
9
backend/data/src/main/kotlin/io/tolgee/activity/UtmDataHolder.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,3 @@ | ||
package io.tolgee.activity | ||
|
||
import org.springframework.stereotype.Component | ||
import org.springframework.web.context.annotation.RequestScope | ||
|
||
@Component | ||
@RequestScope | ||
class UtmDataHolder { | ||
var data: Map<String, Any?>? = null | ||
} | ||
typealias UtmData = Map<String, Any?>? |
Oops, something went wrong.