VERKEERDE CONFIG MEE NAAR PRODUCTIE OMG

database :)

Jenkinsfile

@@ -99,4 +99,4 @@ pipeline {
             }
         }
     }
-}
+}

src/main/java/nl/veenm/jobfindr/domain/Event.java

@@ -1,6 +1,15 @@
 package nl.veenm.jobfindr.domain;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+
+@Entity
 public class Event {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
     private String timestamp;
     private String className;
     private String methodName;
@@ -25,6 +34,10 @@ public class Event {
         this.error = error;
     }
 
+    public Event() {
+
+    }
+
     public String getTimestamp() {
         return timestamp;
     }

src/main/java/nl/veenm/jobfindr/repository/EventRepository.java

@@ -0,0 +1,12 @@
+package nl.veenm.jobfindr.repository;
+
+import io.quarkus.hibernate.orm.panache.PanacheRepository;
+import jakarta.enterprise.context.ApplicationScoped;
+import nl.veenm.jobfindr.domain.Event;
+import nl.veenm.jobfindr.domain.VacatureDetail;
+
+@ApplicationScoped
+public class EventRepository implements PanacheRepository<Event> {
+
+}
+

src/main/java/nl/veenm/jobfindr/repository/VacatureDetailRepository.java

@@ -4,10 +4,6 @@ import io.quarkus.hibernate.orm.panache.PanacheRepository;
 import jakarta.enterprise.context.ApplicationScoped;
 import nl.veenm.jobfindr.domain.VacatureDetail;
 
-import java.time.LocalDate;
-import java.util.List;
-
-
 @ApplicationScoped
 public class VacatureDetailRepository implements PanacheRepository<VacatureDetail> {
 

src/main/java/nl/veenm/jobfindr/services/VacatureService.java

@@ -17,7 +17,6 @@ import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @ApplicationScoped
 public class VacatureService {
@@ -38,7 +37,7 @@ public class VacatureService {
 
     private static final Logger logger = Logger.getLogger(VacatureService.class);
 
-    private final String className = this.getClass().getName();
+    private final String className = this.getClass().getSimpleName();
 
     public List<Vacature> getServices() throws IOException {
         eventService.logInfo(VacatureService.class.getName(), "getServices", "getServices aangeroepen");
@@ -53,7 +52,6 @@ public class VacatureService {
         logger.info("Checking for new vacatures");
         eventService.logInfo(className, "checkAndSendNewVacatures", "Checking for new vacatures");
         LocalDate today = LocalDate.now();
-        LocalDate yesterday = today.minusDays(1);
 
         // Scrape de nieuwste vacatures
         String url = "https://www.meesterbaan.nl/vacatures/50-km?trefwoord=duits&locatie=Apeldoorn";
@@ -71,26 +69,28 @@ public class VacatureService {
         });
 
         // Haal de vacatures van gisteren op
-        List<Vacature> yesterdayVacatures = vacatureRepository.findByDate(yesterday);
+        List<Vacature> yesterdayVacatures = vacatureRepository.findAll().stream().toList();
 
-        // Filter nieuwe vacatures
-        List<Vacature> newVacatures = todayVacatures.stream()
-                .filter(vacature -> yesterdayVacatures.stream()
-                        .noneMatch(yv -> yv.getTitel().equals(vacature.getTitel()) && yv.getUrl().equals(vacature.getUrl())))
-                .collect(Collectors.toList());
+        System.out.println(todayVacatures.size());
+        System.out.println(yesterdayVacatures.size());
+
+
+        todayVacatures.removeIf(a -> yesterdayVacatures.stream().anyMatch(b -> b.getUrl().equals(a.getUrl())));
+
+        System.out.println(todayVacatures.size());
 
         // Alleen nieuwe vacatures opslaan en versturen
-        if (!newVacatures.isEmpty()) {
+        if (!todayVacatures.isEmpty()) {
             // Sla de nieuwe vacatures op
-            newVacatures.forEach(vacature -> {
+            todayVacatures.forEach(vacature -> {
                 vacature.setDatum(today);
                 vacatureDetailRepository.persist(vacature.getDetail());
                 vacatureRepository.persist(vacature);
             });
 
             // Verstuur een e-mail
-            emailService.stuurVacatureEmail("danthefranken@gmail.com", newVacatures);
-            emailService.stuurVacatureEmail("vanveenmel11@gmail.com", newVacatures);
+            emailService.stuurVacatureEmail("danthefranken@gmail.com", todayVacatures);
+            emailService.stuurVacatureEmail("vanveenmel11@gmail.com", todayVacatures);
             logger.info("Nieuwe vacatures verstuurd en opgeslagen.");
             eventService.logSucces(className, "checkAndSendNewVacatures", "Nieuwe vacatures verstuurd en opgeslagen.");
         } else {
@@ -107,6 +107,7 @@ public class VacatureService {
     }
 
     public List<Vacature> getAllVacatures() {
+        eventService.logInfo(className, "getAllVacatures", "fetching all vacatures");
         return vacatureRepository.listAll();
     }
 

src/main/java/nl/veenm/jobfindr/util/EventService.java

@@ -1,8 +1,11 @@
 package nl.veenm.jobfindr.util;
 
+import io.quarkus.scheduler.Scheduled;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
 import nl.veenm.jobfindr.domain.Event;
+import nl.veenm.jobfindr.repository.EventRepository;
 
 import java.time.Instant;
 
@@ -10,8 +13,9 @@ import java.time.Instant;
 public class EventService {
 
     @Inject
-    EventWebSocket eventWebSocket;
+    EventRepository eventRepository;
 
+    @Transactional
     public void logInfo(String className, String methodName, String message) {
         // Maak een nieuw event
         Event event = new Event(
@@ -23,10 +27,10 @@ public class EventService {
                 // Bericht
         );
 
-        // Verstuur het event via WebSocket
-        eventWebSocket.sendEvent(event);
+        saveEvent(event);
     }
 
+    @Transactional
     public void logSucces(String className, String methodName, String message) {
         // Maak een nieuw event
         Event event = new Event(
@@ -38,9 +42,10 @@ public class EventService {
                 // Bericht
         );
 
-        // Verstuur het event via WebSocket
-        eventWebSocket.sendEvent(event);
+        saveEvent(event);
     }
+
+    @Transactional
     public void logError(String className, String methodName, String message, Exception e) {
         // Maak een nieuw event
         Event event = new Event(
@@ -53,7 +58,18 @@ public class EventService {
                 // Bericht
         );
 
-        // Verstuur het event via WebSocket
-        eventWebSocket.sendEvent(event);
+        saveEvent(event);
     }
+
+    private void saveEvent(Event event) {
+        eventRepository.persist(event);
+    }
+
+    @Scheduled(cron = "0 00 00 ? * 1#1")
+    @Transactional
+    public void cleanEvents() {
+        eventRepository.deleteAll();
+    }
+
+
 }

src/main/java/nl/veenm/jobfindr/util/EventWebSocket.java

@@ -1,48 +0,0 @@
-package nl.veenm.jobfindr.util;
-
-import jakarta.websocket.OnOpen;
-import jakarta.websocket.Session;
-import jakarta.websocket.server.ServerEndpoint;
-import nl.veenm.jobfindr.domain.Event;
-import org.jboss.logging.Logger;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.IOException;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-@ServerEndpoint("/events")
-@ApplicationScoped
-public class EventWebSocket {
-
-    private static final Logger logger = Logger.getLogger(EventWebSocket.class);
-    private final Set<Session> sessions = ConcurrentHashMap.newKeySet();
-    private final ObjectMapper objectMapper = new ObjectMapper(); // Om objecten naar JSON te serialiseren
-
-    @OnOpen
-    public void onOpen(Session session) {
-        logger.info("event websocket opened: " + session.getId());
-        sessions.add(session);
-    }
-
-    public void sendEvent(Event event) {
-        String jsonEvent;
-        try {
-            jsonEvent = objectMapper.writeValueAsString(event); // Event naar JSON converteren
-        } catch (IOException e) {
-            logger.error(e);
-            return;
-        }
-
-        for (Session session : sessions) {
-            if (session.isOpen()) {
-                try {
-                    session.getBasicRemote().sendText(jsonEvent);
-                } catch (IOException e) {
-                    logger.error(e);
-                }
-            }
-        }
-    }
-}

src/main/resources/application.properties

@@ -12,8 +12,10 @@ quarkus.datasource.jdbc.url=jdbc:postgresql://${DB_HOST}:${DB_PORT}/vacaturesdb
 quarkus.datasource.username=${DB_USERNAME}
 quarkus.datasource.password=${DB_PASSWORD}
 quarkus.hibernate-orm.database.generation=update
-quarkus.hibernate-orm.log.sql=true
 quarkus.hibernate-orm.sql-load-script=no-file
+quarkus.hibernate-orm.log.highlight-sql=false
+quarkus.hibernate-orm.log.sql=false
+
 
 # CORS configuratie
 quarkus.http.cors=true