From 99790eb3d08e8146080f17ec11619d10fe89bbac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9=20=D0=9A=D0=B0=D1=80=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=D0=B0=D0=B5=D0=B2?= Date: Tue, 13 Jul 2021 20:05:23 +0300 Subject: [PATCH] some formatting editing --- .idea/saveactions_settings.xml | 19 +++++++++++++++++++ i18n/en.json | 3 ++- package-lock.json | 3 +-- src/app/Routes.kt | 2 ++ src/auth/FakeLoginForTestingController.kt | 2 +- src/auth/User.kt | 1 - test/app/JoobyExtensionsTest.kt | 2 +- test/app/LangTest.kt | 4 ++-- test/app/RequestLoggerTest.kt | 14 ++++++++------ test/app/RoutesTest.kt | 2 +- test/app/TestData.kt | 2 ++ test/auth/AuthControllerTest.kt | 12 +++++------- test/auth/AuthModuleTest.kt | 8 ++++---- test/auth/HashingServiceTest.kt | 2 +- test/auth/UserRepositoryTest.kt | 7 ++++--- test/db/BaseRepositoryTest.kt | 2 +- test/db/JdbcExtensionsTest.kt | 3 +-- test/db/RequestTransactionHandlerTest.kt | 10 ++++------ test/db/TransactionTest.kt | 2 +- test/util/CacheTest.kt | 4 ++-- test/util/JsonHttpClientTest.kt | 4 ++-- 21 files changed, 64 insertions(+), 44 deletions(-) create mode 100644 .idea/saveactions_settings.xml diff --git a/.idea/saveactions_settings.xml b/.idea/saveactions_settings.xml new file mode 100644 index 0000000..ad5ff96 --- /dev/null +++ b/.idea/saveactions_settings.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/i18n/en.json b/i18n/en.json index 30742d4..e8b35df 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -11,7 +11,8 @@ "otp": { "message": "Your one-time password is {otp}" }, - "logout": "Log out" + "logout": "Log out", + "unauthorized": "You need to log in" }, "pages": { "home": { diff --git a/package-lock.json b/package-lock.json index 8227b0c..373fc91 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,10 @@ { - "name": "app-ui", + "name": "investing", "version": "0.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "app-ui", "version": "0.0.1", "dependencies": { "bootstrap-scss": "^5.0.1", diff --git a/src/app/Routes.kt b/src/app/Routes.kt index b6c1794..67037bf 100644 --- a/src/app/Routes.kt +++ b/src/app/Routes.kt @@ -3,6 +3,7 @@ package app import auth.AuthController import auth.FakeLoginForTestingController import db.TransactionCoroutineContext +import domain.portfolios.PortfolioController import io.jooby.Context import io.jooby.Jooby import io.jooby.Kooby @@ -15,6 +16,7 @@ fun Kooby.registerRoutes() { mvc() mvc() + mvc() if (environment.isTest) mvc() } } diff --git a/src/auth/FakeLoginForTestingController.kt b/src/auth/FakeLoginForTestingController.kt index 04e557a..e0d0fb1 100644 --- a/src/auth/FakeLoginForTestingController.kt +++ b/src/auth/FakeLoginForTestingController.kt @@ -9,7 +9,7 @@ import io.jooby.annotations.* import io.jooby.exception.NotFoundException @Path("/fake-login") -class FakeLoginForTestingController(val userRepository: UserRepository, val env: Environment): Before { +class FakeLoginForTestingController(private val userRepository: UserRepository, private val env: Environment): Before { override fun before(ctx: Context) { if (!env.isActive("test")) throw IllegalStateException("$javaClass should not be active while not testing") } diff --git a/src/auth/User.kt b/src/auth/User.kt index 3c54a51..f595f3a 100644 --- a/src/auth/User.kt +++ b/src/auth/User.kt @@ -1,6 +1,5 @@ package auth -import auth.Role import db.BaseModel import java.time.Instant import java.util.* diff --git a/test/app/JoobyExtensionsTest.kt b/test/app/JoobyExtensionsTest.kt index cdcb90a..7e9c8ae 100644 --- a/test/app/JoobyExtensionsTest.kt +++ b/test/app/JoobyExtensionsTest.kt @@ -7,7 +7,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test class JoobyExtensionsTest { - val ctx = mockk(relaxed = true) + private val ctx = mockk(relaxed = true) @Test fun isHttps() { diff --git a/test/app/LangTest.kt b/test/app/LangTest.kt index c2036fe..479c67b 100644 --- a/test/app/LangTest.kt +++ b/test/app/LangTest.kt @@ -8,7 +8,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test class LangTest { - val ctx = mockk(relaxed = true) { + private val ctx = mockk(relaxed = true) { every { cookie(Lang.COOKIE).valueOrNull() } returns null } @@ -28,7 +28,7 @@ class LangTest { fun `detect from header`() { every { ctx.header("Accept-Language").valueOrNull() } returns "en-US,en;q=0.9,jp" assertThat(Lang.detect(ctx)).isEqualTo("en") - verify { ctx.setResponseCookie(match { cookie -> cookie.name == Lang.COOKIE && cookie.value == "en" })} + verify { ctx.setResponseCookie(match { cookie -> cookie.name == Lang.COOKIE && cookie.value == "en" }) } } @Test diff --git a/test/app/RequestLoggerTest.kt b/test/app/RequestLoggerTest.kt index 897d0a4..900dafd 100644 --- a/test/app/RequestLoggerTest.kt +++ b/test/app/RequestLoggerTest.kt @@ -14,7 +14,7 @@ import org.slf4j.Logger import org.slf4j.MDC class RequestLoggerTest { - val ctx = mockk(relaxed = true) { + private val ctx = mockk(relaxed = true) { every { remoteAddress } returns "127.0.0.13" every { method } returns "GET" every { requestPath } returns "/path" @@ -28,8 +28,8 @@ class RequestLoggerTest { every { getUser() } returns TestData.user } - val requestLog = mockk(relaxed = true) - val handler = RequestLogger(requestLog) + private val requestLog = mockk(relaxed = true) + private val handler = RequestLogger(requestLog) @Test fun `successful request log with proxy`() { @@ -40,9 +40,11 @@ class RequestLoggerTest { val user = TestData.user verify { - requestLog.info(match { it.matches( - """USER:${user.id} "GET /path\?q=hello" 202 12345 \d+ ms http://referrer "User-Agent"""".toRegex() - )}) + requestLog.info(match { + it.matches( + """USER:${user.id} "GET /path\?q=hello" 202 12345 \d+ ms http://referrer "User-Agent"""".toRegex() + ) + }) } assertThat(MDC.get("requestId")).isNull() } diff --git a/test/app/RoutesTest.kt b/test/app/RoutesTest.kt index 0b85d77..a96098c 100644 --- a/test/app/RoutesTest.kt +++ b/test/app/RoutesTest.kt @@ -9,7 +9,7 @@ import io.mockk.verify import org.junit.jupiter.api.Test class RoutesTest { - val app = mockk(relaxed = true) + private val app = mockk(relaxed = true) @Test fun `mvc routes without before handler`() { diff --git a/test/app/TestData.kt b/test/app/TestData.kt index 5776396..2f59f73 100644 --- a/test/app/TestData.kt +++ b/test/app/TestData.kt @@ -2,8 +2,10 @@ package app import auth.Role.USER import auth.User +import domain.portfolios.Portfolio /** Reusable entities to use in tests to avoid specifying all params */ object TestData { val user = User(login = "login", role = USER, lang = "en") + val portfolio = Portfolio(name = "portfolio name") } diff --git a/test/auth/AuthControllerTest.kt b/test/auth/AuthControllerTest.kt index 7168bc7..8ce9796 100644 --- a/test/auth/AuthControllerTest.kt +++ b/test/auth/AuthControllerTest.kt @@ -1,6 +1,5 @@ package auth -import app.Lang import app.TestData import io.jooby.Context import io.jooby.Session @@ -9,16 +8,15 @@ import io.mockk.* import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows -import auth.Role.USER class AuthControllerTest { - val user = TestData.user - val session = mockk(relaxed = true) - val ctx = mockk(relaxed = true) - val userRepository = mockk(relaxed = true) { + private val user = TestData.user + private val session = mockk(relaxed = true) + private val ctx = mockk(relaxed = true) + private val userRepository = mockk(relaxed = true) { every { create(any(), any(), any(), any()) } returns user } - val controller = AuthController(userRepository) + private val controller = AuthController(userRepository) @Test fun `login with password`() { diff --git a/test/auth/AuthModuleTest.kt b/test/auth/AuthModuleTest.kt index 8c5bb35..3fd27bf 100644 --- a/test/auth/AuthModuleTest.kt +++ b/test/auth/AuthModuleTest.kt @@ -1,5 +1,6 @@ package auth +import auth.Role.* import io.jooby.AssetHandler import io.jooby.Context import io.jooby.exception.BadRequestException @@ -9,15 +10,14 @@ import io.mockk.mockk import io.mockk.verify import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows -import auth.Role.* import java.util.* class AuthModuleTest { - val user = User(login = "login", role = USER, lang = "et") - val ctx = mockk(relaxed = true) { + private val user = User(login = "login", role = USER, lang = "et") + private val ctx = mockk(relaxed = true) { every { requestPath } returns "/api/anything" } - val auth = AuthModule().apply { + private val auth = AuthModule().apply { userRepository = mockk(relaxed = true) { every { get(user.id) } returns user } diff --git a/test/auth/HashingServiceTest.kt b/test/auth/HashingServiceTest.kt index 16bd22f..1c181ca 100644 --- a/test/auth/HashingServiceTest.kt +++ b/test/auth/HashingServiceTest.kt @@ -5,7 +5,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test class HashingServiceTest { - val hashingService = HashingService() + private val hashingService = HashingService() @Test fun hashPassword() { diff --git a/test/auth/UserRepositoryTest.kt b/test/auth/UserRepositoryTest.kt index e98ca8d..1c84504 100644 --- a/test/auth/UserRepositoryTest.kt +++ b/test/auth/UserRepositoryTest.kt @@ -1,16 +1,17 @@ package auth +import auth.Role.ADMIN +import auth.Role.USER import db.DBTest import io.mockk.every import io.mockk.mockk import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import auth.Role.* import java.security.SecureRandom class UserRepositoryTest: DBTest() { - val random = mockk(relaxed = true) - val repository = UserRepository(db, HashingService(), random) + private val random = mockk(relaxed = true) + private val repository = UserRepository(db, HashingService(), random) @Test fun create() { diff --git a/test/db/BaseRepositoryTest.kt b/test/db/BaseRepositoryTest.kt index 1cd4caf..3261522 100644 --- a/test/db/BaseRepositoryTest.kt +++ b/test/db/BaseRepositoryTest.kt @@ -4,7 +4,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test class BaseRepositoryTest: DBTest() { - val repository = object: BaseRepository(db, "users") {} + private val repository = object: BaseRepository(db, "users") {} @Test fun count() { diff --git a/test/db/JdbcExtensionsTest.kt b/test/db/JdbcExtensionsTest.kt index a23a1c0..c39cbb1 100644 --- a/test/db/JdbcExtensionsTest.kt +++ b/test/db/JdbcExtensionsTest.kt @@ -5,11 +5,10 @@ import org.junit.jupiter.api.* import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS import java.util.* import java.util.UUID.randomUUID -import kotlin.NoSuchElementException @TestInstance(PER_CLASS) class JdbcExtensionsTest: DBTest() { - val table = "temp" + private val table = "temp" @BeforeAll fun before() { db.exec("create table $table(id uuid primary key, hello varchar, world int)") diff --git a/test/db/RequestTransactionHandlerTest.kt b/test/db/RequestTransactionHandlerTest.kt index 3d070d6..e16d21b 100644 --- a/test/db/RequestTransactionHandlerTest.kt +++ b/test/db/RequestTransactionHandlerTest.kt @@ -1,8 +1,6 @@ package db import com.zaxxer.hikari.util.DriverDataSource -import db.RequestTransactionHandler -import db.Transaction import io.jooby.* import io.mockk.* import org.assertj.core.api.Assertions.assertThat @@ -11,16 +9,16 @@ import java.sql.Connection import javax.sql.DataSource class RequestTransactionHandlerTest { - val ctx = mockk(relaxed = true) { + private val ctx = mockk(relaxed = true) { every { requestPath } returns "/path" every { queryString() } returns "?q=hello" every { attribute("tx") } answers { Transaction.current()!! } } - val conn = mockk(relaxed = true) - val db = mockk(relaxed = true) { + private val conn = mockk(relaxed = true) + private val db = mockk(relaxed = true) { every { connection } returns conn } - val handler = RequestTransactionHandler() + private val handler = RequestTransactionHandler() @Test fun `commit on success`() { diff --git a/test/db/TransactionTest.kt b/test/db/TransactionTest.kt index 0dfe5db..4f12cd2 100644 --- a/test/db/TransactionTest.kt +++ b/test/db/TransactionTest.kt @@ -7,7 +7,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test class TransactionTest { - val db = mockk(relaxed = true) + private val db = mockk(relaxed = true) @Test fun `transaction does not open connection at start`() { diff --git a/test/util/CacheTest.kt b/test/util/CacheTest.kt index 6517b75..aee3211 100644 --- a/test/util/CacheTest.kt +++ b/test/util/CacheTest.kt @@ -4,8 +4,8 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test class CacheTest { - var count = 0 - val provider = { ++count } // e.g. { http.get("/something") } + private var count = 0 + private val provider = { ++count } // e.g. { http.get("/something") } @Test fun `cache does not expire`() { diff --git a/test/util/JsonHttpClientTest.kt b/test/util/JsonHttpClientTest.kt index e51bb54..610a367 100644 --- a/test/util/JsonHttpClientTest.kt +++ b/test/util/JsonHttpClientTest.kt @@ -15,8 +15,8 @@ import java.net.http.HttpResponse import java.util.concurrent.CompletableFuture.completedFuture class JsonHttpClientTest { - val httpClient = mockk() - val http = JsonHttpClient("http://some.host/v1", { setHeader("X-Custom-API", "123") }, http = httpClient) + private val httpClient = mockk() + private val http = JsonHttpClient("http://some.host/v1", { setHeader("X-Custom-API", "123") }, http = httpClient) @Test fun get() {