OY-4717 katselmointihuomiot

Opetushallitus · Jan 10, 2025 · 01c8c39 · 01c8c39
1 parent 627465c
commit 01c8c39
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/src/main/scala/fi/vm/sade/hakemuseditori/hakemus/ImmutableLegacyApplicationWrapper.scala b/src/main/scala/fi/vm/sade/hakemuseditori/hakemus/ImmutableLegacyApplicationWrapper.scala
@@ -17,9 +17,6 @@ object ImmutableLegacyApplicationWrapper extends Logging {
   type LegacyApplicationAnswers = Map[String, Map[String, String]]
 
   def wrap(application: Application) = {
-    logger.info("wrapataan")
-    logger.info(s"application oid: ${application.getOid}")
-    logger.info(s"application answers: ${application.getAnswers.size()}")
     val answers: LegacyApplicationAnswers = {
       application.getAnswers.toMap.mapValues { phaseAnswers => phaseAnswers.toMap }
     }

diff --git a/src/main/scala/fi/vm/sade/omatsivut/db/impl/SessionRepositoryImpl.scala b/src/main/scala/fi/vm/sade/omatsivut/db/impl/SessionRepositoryImpl.scala
@@ -2,9 +2,9 @@ package fi.vm.sade.omatsivut.db.impl
 
 import java.util.UUID
 import java.util.concurrent.TimeUnit
-
 import fi.vm.sade.omatsivut.SessionFailure
 import fi.vm.sade.omatsivut.SessionFailure.SessionFailure
+import fi.vm.sade.omatsivut.cas.CasClient.ServiceTicket
 import fi.vm.sade.omatsivut.db.SessionRepository
 import fi.vm.sade.omatsivut.security.{Hetu, OppijaNumero, SessionId, SessionInfo}
 import slick.jdbc.PostgresProfile.api._
@@ -29,7 +29,7 @@ trait SessionRepositoryImpl extends SessionRepository with OmatsivutRepository {
     runBlocking(sqlu"""delete from sessions where id = ${id.value.toString}::uuid""", timeout = Duration(10, TimeUnit.SECONDS))
   }
 
-  override def deleteByServiceTicket(ticket: String): Unit = {
+  override def deleteByServiceTicket(ticket: ServiceTicket): Unit = {
     runBlocking(sqlu"""delete from sessions where ticket = ${ticket.value}""", timeout = Duration(10, TimeUnit.SECONDS))
   }
 

diff --git a/src/main/scala/fi/vm/sade/omatsivut/servlet/ApplicationsServlet.scala b/src/main/scala/fi/vm/sade/omatsivut/servlet/ApplicationsServlet.scala
@@ -57,15 +57,13 @@ trait ApplicationsServletContainer {
       val oid = personOid()
       hakemusEditori.fetchByPersonOid(request, oid, Fetch) match {
         case FullSuccess(hakemukset) =>
-          logger.info("ApplicationsServlet get FullSuccess")
           Map(
             "allApplicationsFetched" -> true,
             "applications" -> hakemukset,
             "migriJwt" -> migriJwt.createMigriJWT(oid),
             "migriUrl" -> appConfig.settings.migriUrl
           )
         case PartialSuccess(hakemukset, exceptions) =>
-          logger.info("ApplicationsServlet get PartialSuccess")
           exceptions.foreach(logger.warn(s"Failed to fetch all applications for oid $oid",_))
           Map(
             "allApplicationsFetched" -> false,
@@ -74,7 +72,6 @@ trait ApplicationsServletContainer {
             "migriUrl" -> appConfig.settings.migriUrl
           )
         case FullFailure(exceptions) =>
-          logger.info("ApplicationsServlet get FullFailure")
           exceptions.foreach(logger.error(s"Failed to fetch applications for oid $oid", _))
           throw exceptions.head
       }

diff --git a/src/main/scala/fi/vm/sade/omatsivut/vastaanotto/VastaanottoService.scala b/src/main/scala/fi/vm/sade/omatsivut/vastaanotto/VastaanottoService.scala
@@ -28,6 +28,8 @@ trait VastaanottoComponent {
   def vastaanottoService(implicit language: Language): VastaanottoService
 
   class VastaanottoService(config: AppConfig)(implicit language: Language) extends JsonFormats {
+    val OPH_PAAKAYTTAJA = "APP_VIESTINVALITYS_OPH_PAAKAYTTAJA"
+    val OPH_ORGANISAATIO_OID = "1.2.246.562.10.00000000001"
 
     lazy val viestinvalitysClient =
       ClientBuilder.viestinvalitysClientBuilder()
@@ -96,7 +98,7 @@ trait VastaanottoComponent {
           .withVastaanottaja(Optional.empty(), email)
           .build())
         .withKayttooikeusRajoitukset(ViestinvalitysBuilder.kayttooikeusrajoituksetBuilder()
-             .withKayttooikeus("APP_HAKEMUS_CRUD", "1.2.246.562.10.240484683010")
+             .withKayttooikeus(OPH_PAAKAYTTAJA, OPH_ORGANISAATIO_OID)
              .build())
         .withLahettavaPalvelu("omatsivut")
         .withNormaaliPrioriteetti()