-
-
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
51 changed files
with
6,433 additions
and
4,764 deletions.
There are no files selected for viewing
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
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 = "Business events reporting") | ||
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,29 @@ | ||
package io.tolgee.controllers | ||
|
||
import com.posthog.java.PostHog | ||
import io.tolgee.dtos.misc.CreateProjectInvitationParams | ||
import io.tolgee.dtos.request.auth.SignUpDto | ||
import io.tolgee.fixtures.andAssertResponse | ||
import io.tolgee.fixtures.andIsBadRequest | ||
import io.tolgee.fixtures.andIsOk | ||
import io.tolgee.fixtures.generateUniqueString | ||
import io.tolgee.fixtures.waitForNotThrowing | ||
import io.tolgee.model.enums.ProjectPermissionType | ||
import io.tolgee.testing.AbstractControllerTest | ||
import io.tolgee.testing.assertions.Assertions.assertThat | ||
import org.junit.jupiter.api.AfterEach | ||
import org.junit.jupiter.api.BeforeEach | ||
import org.junit.jupiter.api.Test | ||
import org.mockito.Mockito | ||
import org.mockito.kotlin.any | ||
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.autoconfigure.web.servlet.AutoConfigureMockMvc | ||
import org.springframework.boot.test.context.SpringBootTest | ||
import org.springframework.boot.test.mock.mockito.MockBean | ||
import kotlin.properties.Delegates | ||
|
||
@SpringBootTest | ||
@AutoConfigureMockMvc | ||
class PublicControllerTest : | ||
AbstractControllerTest() { | ||
|
@@ -25,6 +32,7 @@ class PublicControllerTest : | |
|
||
@BeforeEach | ||
fun setup() { | ||
Mockito.reset(postHog) | ||
canCreateOrganizations = tolgeeProperties.authentication.userCanCreateOrganizations | ||
} | ||
|
||
|
@@ -33,6 +41,10 @@ class PublicControllerTest : | |
tolgeeProperties.authentication.userCanCreateOrganizations = canCreateOrganizations | ||
} | ||
|
||
@MockBean | ||
@Autowired | ||
lateinit var postHog: PostHog | ||
|
||
@Test | ||
fun `creates organization`() { | ||
val dto = SignUpDto( | ||
|
@@ -52,6 +64,15 @@ class PublicControllerTest : | |
assertThat(organizationRepository.findAllByName("Pavel Novak")).hasSize(1) | ||
} | ||
|
||
@Test | ||
fun `logs event to post hog`() { | ||
val dto = SignUpDto(name = "Pavel Novak", password = "aaaaaaaaa", email = "[email protected]") | ||
performPost("/api/public/sign_up", dto).andIsOk | ||
waitForNotThrowing(timeout = 10000) { | ||
verify(postHog, times(1)).capture(any(), eq("SIGN_UP"), any()) | ||
} | ||
} | ||
|
||
@Test | ||
fun `doesn't create organization when invitation provided`() { | ||
val base = dbPopulator.createBase(generateUniqueString()) | ||
|
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
Oops, something went wrong.