Lisää muutoksia

Opetushallitus · Nov 15, 2024 · b940b37 · b940b37
1 parent 6e60b11
commit b940b37
Show file tree

Hide file tree

Showing 35 changed files with 764 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,5 @@ tarjonta-app-angular/nbproject
 tarjonta-app-angular/config/protractor-credentials.js
 pom.xml.versionsBackup
 versioneye.properties
+
+dev.yml
diff --git a/pom.xml b/pom.xml
@@ -40,19 +40,14 @@
                 <version>3.1.9</version>
             </dependency>
             <dependency>
-                <groupId>org.glassfish.jaxb</groupId>
-                <artifactId>jaxb-api</artifactId>
-                <version>4.0.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jaxb</groupId>
-                <artifactId>jaxb-core</artifactId>
-                <version>4.0.5</version>
+                <groupId>javax.activation</groupId>
+                <artifactId>activation</artifactId>
+                <version>1.1</version>
             </dependency>
             <dependency>
                 <groupId>org.glassfish.jaxb</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>4.0.5</version>
+                <artifactId>jaxb-runtime</artifactId>
+                <version>2.3.6</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -145,12 +140,7 @@
             <dependency>
                 <groupId>jakarta.xml.bind</groupId>
                 <artifactId>jakarta.xml.bind-api</artifactId>
-                <version>2.3.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jaxb</groupId>
-                <artifactId>jaxb-runtime</artifactId>
-                <version>2.3.2</version>
+                <version>4.0.1</version>
             </dependency>
             <dependency>
                 <groupId>fi.vm.sade.log</groupId>
@@ -240,6 +230,31 @@
                 <artifactId>oid-api</artifactId>
                 <version>8.0-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>42.7.4</version>
+            </dependency>
+            <dependency>
+                <groupId>org.flywaydb</groupId>
+                <artifactId>flyway-database-postgresql</artifactId>
+                <version>10.21.0</version>
+            </dependency>
+            <dependency>
+                <groupId>fi.vm.sade.java-utils</groupId>
+                <artifactId>opintopolku-cas-servlet-filter</artifactId>
+                <version>1.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>fi.vm.sade.java-utils</groupId>
+                <artifactId>opintopolku-user-details-service</artifactId>
+                <version>0.3.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback.access</groupId>
+                <artifactId>tomcat</artifactId>
+                <version>2.0.3</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/tarjonta-service/dev/dev.yml.template b/tarjonta-service/dev/dev.yml.template
@@ -0,0 +1,13 @@
+spring:
+  datasource:
+    url: jdbc:postgresql://localhost:5489/tarjonta?ApplicationName=tarjonta-service
+    username: oph
+    password: oph
+
+cas:
+  service: http://localhost:8080/tarjonta-service
+
+host:
+  host-virkailija: virkailija.testiopintopolku.fi
+  host-cas: virkailija.testiopintopolku.fi
+  host-alb: https://virkailija.testiopintopolku.fi
diff --git a/tarjonta-service/dev/logback.xml b/tarjonta-service/dev/logback.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+          <pattern>%d{yyyy-MM-dd'T'HH:mm:ss.SSSX} %-5p {%X{user}} [%t] %-5p %c: %m%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="APP" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <Append>true</Append>
+        <File>/tmp/oph-tarjonta-service.log</File>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd'T'HH:mm:ss.SSSX} %-5p {%X{user}} [%t] %-5p %c: %m%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>DEBUG</level>
+        </filter>
+        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+            <maxIndex>20</maxIndex>
+            <FileNamePattern>/tmp/oph-tarjonta-service.log.%i</FileNamePattern>
+        </rollingPolicy>
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <MaxFileSize>10MB</MaxFileSize>
+        </triggeringPolicy>
+    </appender>
+    <appender name="AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>/tmp/auditlog_tarjonta-service.log</file>
+        <append>true</append>
+        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+            <fileNamePattern>${user.home}/logs/auditlog_tarjonta-service.%i.log</fileNamePattern>
+            <minIndex>1</minIndex>
+            <maxIndex>10</maxIndex>
+        </rollingPolicy>
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <maxFileSize>10MB</maxFileSize>
+        </triggeringPolicy>
+        <encoder>
+            <pattern>%msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Standard logging -->
+    <root level="info">
+        <appender-ref ref="APP" />
+        <appender-ref ref="STDOUT" />
+    </root>
+    <logger name="org.springframework" level="warn" />
+    <logger name="org.springframework.security" level="warn" />
+    <logger name="org.springframework.boot.autoconfigure.security.AuthenticationManagerConfiguration" level="info" />
+    <logger name="fi.vm.sade.java_utils.security.OpintopolkuCasAuthenticationFilter" level="error" />
+    <logger name="org.hibernate.SQL" level="error" />
+    <logger name="io.swagger.models.parameters.AbstractSerializableParameter" level="error" />
+
+    <!-- Auditlog  -->
+    <logger name="fi.oph.ohjausparametrit.audit.AuditHelper" level="INFO" additivity="false">
+        <appender-ref ref="AUDIT" />
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+</configuration>
diff --git a/tarjonta-service/pom.xml b/tarjonta-service/pom.xml
@@ -94,6 +94,10 @@
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
@@ -201,6 +205,22 @@
             <groupId>fi.vm.sade.oid</groupId>
             <artifactId>oid-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>fi.vm.sade.java-utils</groupId>
+            <artifactId>opintopolku-cas-servlet-filter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>fi.vm.sade.java-utils</groupId>
+            <artifactId>opintopolku-user-details-service</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback.access</groupId>
+            <artifactId>tomcat</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/App.java b/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/App.java
@@ -0,0 +1,13 @@
+package fi.vm.sade.tarjonta;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class App {
+
+  public static void main(String[] args) {
+    System.setProperty("server.servlet.context-path", "/tarjonta-service");
+    SpringApplication.run(App.class, args);
+  }
+}
diff --git a/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/model/BaseEntity.java b/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/model/BaseEntity.java
@@ -13,7 +13,8 @@ public class BaseEntity implements Serializable {
 
   @Id
   @Column(name = ID_COLUMN_NAME, unique = true, nullable = false)
-  @GeneratedValue
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "hibernate_sequence")
+  @SequenceGenerator(name = "hibernate_sequence", allocationSize = 1)
   private Long id;
 
   @Version

diff --git a/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/model/Hakukohde.java b/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/model/Hakukohde.java
@@ -46,7 +46,7 @@ public class Hakukohde extends TarjontaBaseEntity {
       mappedBy = "hakukohde",
       orphanRemoval = true)
   @OrderBy("id ASC")
-  private SortedSet<Valintakoe> valintakoes = new TreeSet<>();
+  private Set<Valintakoe> valintakoes = new HashSet<>();
 
   /** The koodisto uri of the name of this hakukohde object. */
   @Column(name = "hakukohde_nimi")
@@ -123,6 +123,7 @@ public class Hakukohde extends TarjontaBaseEntity {
   private MonikielinenTeksti lisatiedot;
 
   @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true)
+  @CollectionTable(name = Hakukohde.TABLE_NAME + "_" + PainotettavaOppiaine.TABLE_NAME)
   private Set<PainotettavaOppiaine> painotettavatOppiaineet = new HashSet<PainotettavaOppiaine>();
 
   @OneToMany(
@@ -375,7 +376,7 @@ public void setAloituspaikatLkm(int aloituspaikatLkm) {
   /**
    * @return the valintakoes
    */
-  public SortedSet<Valintakoe> getValintakoes() {
+  public Set<Valintakoe> getValintakoes() {
     if (valintakoes == null) {
       valintakoes = new TreeSet<>();
     }

diff --git a/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/model/KoulutusPermission.java b/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/model/KoulutusPermission.java
@@ -9,7 +9,8 @@ public class KoulutusPermission {
 
   @Id
   @Column(name = "id", unique = true, nullable = false)
-  @GeneratedValue
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "hibernate_sequence")
+  @SequenceGenerator(name = "hibernate_sequence", allocationSize = 1)
   private Long id;
 
   @Column(name = "org_oid")

diff --git a/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/model/KoulutusmoduuliToteutus.java b/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/model/KoulutusmoduuliToteutus.java
@@ -185,6 +185,12 @@ public class KoulutusmoduuliToteutus extends BaseKoulutusmoduuli {
   private Set<Hakukohde> hakukohdes = new HashSet<Hakukohde>();
 
   @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+  @JoinTable(
+      name = TABLE_NAME + "_yhteyshenkilo",
+      joinColumns =
+          @JoinColumn(name = TABLE_NAME + "_id", referencedColumnName = BaseEntity.ID_COLUMN_NAME),
+      inverseJoinColumns =
+          @JoinColumn(name = "yhteyshenkilos_id", referencedColumnName = BaseEntity.ID_COLUMN_NAME))
   private Set<Yhteyshenkilo> yhteyshenkilos = new HashSet<Yhteyshenkilo>();
 
   @ElementCollection(fetch = FetchType.EAGER)
@@ -205,6 +211,11 @@ public class KoulutusmoduuliToteutus extends BaseKoulutusmoduuli {
   // Lukiospesifeja kenttia
   @MapKey(name = "key")
   @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
+  @JoinTable(
+      name = TABLE_NAME + "_kielivalikoima",
+      joinColumns =
+          @JoinColumn(name = TABLE_NAME + "_id", referencedColumnName = BaseEntity.ID_COLUMN_NAME),
+      inverseJoinColumns = @JoinColumn(name = "tarjotutkielet_id"))
   private Map<String, Kielivalikoima> tarjotutKielet = new HashMap<String, Kielivalikoima>();
 
   @ElementCollection(fetch = FetchType.EAGER)
@@ -223,6 +234,8 @@ public class KoulutusmoduuliToteutus extends BaseKoulutusmoduuli {
   @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true)
   @JoinTable(
       name = TABLE_NAME + "_tekstit",
+      joinColumns =
+          @JoinColumn(name = TABLE_NAME + "_id", referencedColumnName = BaseEntity.ID_COLUMN_NAME),
       inverseJoinColumns = @JoinColumn(name = "monikielinen_teksti_id"))
   @MapKeyEnumerated(EnumType.STRING)
   @MapKeyColumn(name = "teksti", nullable = false)
@@ -232,6 +245,8 @@ public class KoulutusmoduuliToteutus extends BaseKoulutusmoduuli {
   @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
   @JoinTable(
       name = TABLE_NAME + "_kuvat",
+      joinColumns =
+          @JoinColumn(name = TABLE_NAME + "_id", referencedColumnName = BaseEntity.ID_COLUMN_NAME),
       inverseJoinColumns = @JoinColumn(name = "binary_data_id"))
   @MapKeyColumn(name = "kieli_uri", nullable = false)
   private Map<String, BinaryData> kuvat = new HashMap<String, BinaryData>();

diff --git a/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/model/Massakopiointi.java b/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/model/Massakopiointi.java
@@ -19,14 +19,11 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
-import jakarta.persistence.Lob;
 import jakarta.persistence.Table;
 import jakarta.persistence.Temporal;
 import jakarta.persistence.TemporalType;
 import jakarta.persistence.UniqueConstraint;
-import java.sql.Types;
 import java.util.Date;
-import org.hibernate.annotations.JdbcTypeCode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -56,13 +53,9 @@ public class Massakopiointi extends BaseEntity {
   @Enumerated(EnumType.STRING)
   private Tyyppi type;
 
-  @Lob
-  @JdbcTypeCode(Types.LONGVARCHAR)
   @Column(name = "json", length = 100000)
   private String json;
 
-  @Lob
-  // @Type(type = "org.hibernate.type.TextType")
   @Column(name = "meta", length = 100000)
   private String meta;
 

diff --git a/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/model/PainotettavaOppiaine.java b/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/model/PainotettavaOppiaine.java
@@ -27,10 +27,12 @@
  */
 @Entity
 @JsonIgnoreProperties({"id", "version"})
-@Table(name = "painotettavaoppiaine")
+@Table(name = PainotettavaOppiaine.TABLE_NAME)
 @EntityListeners(XssFilterListener.class)
 public class PainotettavaOppiaine extends TarjontaBaseEntity {
 
+  public static final String TABLE_NAME = "painotettavaoppiaine";
+
   /** */
   private static final long serialVersionUID = 1L;
 

diff --git a/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/model/ValintaperusteSoraKuvaus.java b/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/model/ValintaperusteSoraKuvaus.java
@@ -1,10 +1,12 @@
 package fi.vm.sade.tarjonta.model;
 
 import jakarta.persistence.*;
+import java.sql.Types;
 import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.NotNull;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.hibernate.annotations.JdbcTypeCode;
 
 @Entity
 @JsonIgnoreProperties({"id", "version"})
@@ -42,6 +44,7 @@ public static enum Tila {
   private String organisaatioTyyppi;
 
   @Column(name = "tyyppi")
+  @JdbcTypeCode(Types.INTEGER)
   private Tyyppi tyyppi;
 
   @Column(name = "kausi")
@@ -52,6 +55,14 @@ public static enum Tila {
 
   @Column(name = "tekstis")
   @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+  @JoinTable(
+      name = ValintaperusteSoraKuvaus.VALINTAPERUSTEKUVAUSORA_TABLE_NAME + "_monikielinen_metadata",
+      joinColumns =
+          @JoinColumn(
+              name = ValintaperusteSoraKuvaus.VALINTAPERUSTEKUVAUSORA_TABLE_NAME + "_id",
+              referencedColumnName = BaseEntity.ID_COLUMN_NAME),
+      inverseJoinColumns =
+          @JoinColumn(name = "tekstis_id", referencedColumnName = BaseEntity.ID_COLUMN_NAME))
   private List<MonikielinenMetadata> tekstis;
 
   @Column(name = "viimPaivitysPvm")

diff --git a/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/model/Yhteystiedot.java b/tarjonta-service/src/main/java/fi/vm/sade/tarjonta/model/Yhteystiedot.java
@@ -14,10 +14,7 @@ public class Yhteystiedot extends TarjontaBaseEntity {
   public static final String TABLE_NAME = "yhteystiedot";
   private static final long serialVersionUID = 2820464295959137992L;
 
-  @JoinColumn(name = "hakukohde_id", nullable = false)
-  @JsonIgnore
-  @JsonBackReference
-  private Hakukohde hakukohde;
+  @ManyToOne @JsonIgnore @JsonBackReference private Hakukohde hakukohde;
 
   @Column(name = "lang")
   private String lang;