Skip to content

Commit 88c17de

Browse files
committed
OK-567 WIP Add a very barebones version of SiirtotiedostoApp
1 parent 7b049e7 commit 88c17de

File tree

3 files changed

+55
-13
lines changed

3 files changed

+55
-13
lines changed

ovara-suoritusrekisteri/src/main/scala/fi/vm/sade/hakurekisteri/ovara/ajastus/SiirtotiedostoApp.scala

Lines changed: 53 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,68 @@
11
package fi.vm.sade.hakurekisteri.ovara.ajastus
22

3+
import akka.actor.ActorSystem
34
import org.slf4j.{Logger, LoggerFactory}
4-
import fi.vm.sade.hakurekisteri
55
import fi.vm.sade.hakurekisteri.Config
6-
import fi.vm.sade.hakurekisteri.ovara.SiirtotiedostoClient
6+
import fi.vm.sade.hakurekisteri.integration.henkilo.PersonOidsWithAliases
7+
import fi.vm.sade.hakurekisteri.ovara.{OvaraDbRepository, OvaraDbRepositoryImpl, OvaraService, SiirtotiedostoClient}
8+
import support.{BareRegisters, BaseKoosteet, DbJournals, Integrations, PersonAliasesProvider}
9+
10+
import scala.concurrent.Future
711

812
object SiirtotiedostoApp {
9-
private val logger: Logger = LoggerFactory.getLogger("fi.vm.sade.valintatulosservice.ovara.ajastus.SiirtotiedostoApp")
13+
private val logger: Logger =
14+
LoggerFactory.getLogger("fi.vm.sade.valintatulosservice.ovara.ajastus.SiirtotiedostoApp")
15+
16+
17+
def createOvaraService(config: Config, system: ActorSystem) = {
18+
implicit val actorSystem: ActorSystem = system
19+
val journals = new DbJournals(config)
20+
21+
val noAliasesProvider = new PersonAliasesProvider {
22+
override def enrichWithAliases(henkiloOids: Set[String]): Future[PersonOidsWithAliases] = {
23+
Future.successful(PersonOidsWithAliases(henkiloOids, Map()))
24+
}
25+
}
26+
27+
//Todo, saadaanko jotenkin helposti käsiin ensikertalaisActor ja hakuActor ilman että initialisoidaan koko himmeli,
28+
//vrt. ovaraDbRepository. HakuActoria ei tarvita, jos haetaan aktiiviset kk-haut jollain muulla tavalla.
29+
//val registers =
30+
// new BareRegisters(system, journals, journals.database, noAliasesProvider, config)
31+
//val integrations = Integrations(registers, system, config)
32+
33+
val ovaraDbRepository: OvaraDbRepository = new OvaraDbRepositoryImpl(journals.database)
34+
//val koosteet = new BaseKoosteet(system, integrations, registers, config)
1035

36+
new OvaraService(
37+
ovaraDbRepository,
38+
new SiirtotiedostoClient(config.siirtotiedostoClientConfig),
39+
null, //fixme
40+
null, //fixme
41+
config.siirtotiedostoPageSize
42+
)
43+
}
1144
def main(args: Array[String]): Unit = {
12-
logger.info(s"Hello, ovara world!")
13-
println("wahey!")
1445
try {
15-
val config = Config.fromString("default")
16-
val clientConfig = config.siirtotiedostoClientConfig
17-
logger.info(s"Using clientConfig: $clientConfig")
18-
//Todo implement ajastus db logic and instantiate OvaraService etc
19-
val result = "jee"
46+
implicit val system: ActorSystem = ActorSystem("ovara-suoritusrekisteri")
47+
48+
println("Hello, ovara-suoritusrekisteri world!")
49+
50+
logger.info(s"Hello, ovara-suoritusrekisteri world!")
51+
52+
val config = Config.fromString("default")
53+
54+
val clientConfig = config.siirtotiedostoClientConfig
55+
logger.info(s"Using clientConfig: $clientConfig")
56+
57+
val ovaraService = createOvaraService(config, system)
58+
59+
//Todo implement ajastus db logic and instantiate OvaraService etc
60+
val result = ovaraService.formSiirtotiedostotPaged(1718312400000L, System.currentTimeMillis())
2061
logger.info(s"Operation result: $result")
21-
//"a"
62+
system.terminate()
2263
} catch {
2364
case t: Throwable =>
65+
println(s"Virhe siirtotiedoston muodostamisessa: ${t.getMessage}")
2466
logger.error(s"Virhe siirtotiedoston muodostamisessa: ${t.getMessage}", t)
2567
}
2668
}

suoritusrekisteri/src/main/scala/fi/vm/sade/hakurekisteri/Config.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ class MockDevConfig extends Config {
218218
override val importBatchProcessingInitialDelay = 1.seconds
219219
lazy val ophConfDir = Paths.get(
220220
ProjectRootFinder.findProjectRoot().getAbsolutePath,
221-
"src/test/resources/oph-configuration"
221+
"suoritusrekisteri/src/test/resources/oph-configuration"
222222
)
223223
}
224224

suoritusrekisteri/src/test/scala/fi/vm/sade/hakurekisteri/MockConfig.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class MockConfig extends Config {
2828
override val importBatchProcessingInitialDelay = 1.seconds
2929
lazy val ophConfDir = Paths.get(
3030
ProjectRootFinder.findProjectRoot().getAbsolutePath,
31-
"src/test/resources/oph-configuration"
31+
"suoritusrekisteri/src/test/resources/oph-configuration"
3232
)
3333
override val valintaTulosTimeout: FiniteDuration = 1.minute
3434
override val ytlSyncTimeout: Timeout = Timeout(1, SECONDS)

0 commit comments

Comments
 (0)