484 diveni stat - draft

backend/src/main/java/io/diveni/backend/controller/AnalyticsController.java

@@ -1,7 +1,5 @@
 package io.diveni.backend.controller;
 
-import java.time.LocalDate;
-import java.util.List;
 import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
@@ -12,92 +10,36 @@
 import org.springframework.web.bind.annotation.GetMapping;
 
 import io.diveni.backend.model.AnalyticsData;
-import io.diveni.backend.model.Session;
 import io.diveni.backend.service.DatabaseService;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 public class AnalyticsController {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(RoutesController.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(AnalyticsController.class);
 
   @Autowired DatabaseService databaseService;
 
   @GetMapping(value = "/analytics/All")
   public ResponseEntity<AnalyticsData> getAllData() {
     LOGGER.debug("--> getAllData()");
+
     int amountOfAllSessions =
-        databaseService.getSessions().size() + databaseService.getDeletedSessions().size();
+        databaseService.getSessions().size() + databaseService.getDeletedSessions();
     int amountOfAllAttendees =
         databaseService.getSessions().stream()
-            .collect(Collectors.summingInt(s -> s.getMembers().size())); // existing Sessions
-    amountOfAllAttendees +=
-        databaseService.getDeletedSessions().stream()
-            .collect(Collectors.summingInt(deletedSess -> deletedSess.getMembers().size()));
-
-    amountOfAllAttendees +=
-        databaseService.getDeletedSessions().stream()
-            .filter(
-                ds ->
-                    databaseService.getRemovedMember().stream()
-                        .anyMatch(rm -> rm.getSessionID().equals(ds.getSessionID())))
-            .count();
-
-    int lastMonth = LocalDate.now().getMonthValue();
-    int counter;
-    int year;
-    if (lastMonth == 1) {
-      counter = 11;
-      year = LocalDate.now().getYear() - 1;
-    } else {
-      counter = -1;
-      year = LocalDate.now().getYear();
-    }
-    int finalLastMonth = lastMonth + counter;
-    List<Session> sessionFromLastMonth =
-        databaseService.getSessions().stream()
-            .filter(
-                s ->
-                    s.getCreationTime().getMonthValue() == finalLastMonth
-                        && s.getCreationTime().getYear() == year)
-            .collect(Collectors.toList());
-
-    List<Session> deletedsessionFromLastMonth =
-        databaseService.getDeletedSessions().stream()
-            .filter(
-                s ->
-                    s.getCreationTime().getMonthValue() == finalLastMonth
-                        && s.getCreationTime().getYear() == year)
-            .collect(Collectors.toList());
-
-    int amountOfSessionsLastMonth =
-        sessionFromLastMonth.size() + deletedsessionFromLastMonth.size();
-    int amountOfAttendeesLastMonth =
-        sessionFromLastMonth.stream().collect(Collectors.summingInt(s -> s.getMembers().size()));
-
-    amountOfAttendeesLastMonth +=
-        deletedsessionFromLastMonth.stream()
             .collect(Collectors.summingInt(s -> s.getMembers().size()));
-
-    amountOfAttendeesLastMonth +=
-        deletedsessionFromLastMonth.stream()
-            .filter(
-                ds ->
-                    databaseService.getRemovedMember().stream()
-                        .anyMatch(rm -> rm.getSessionID().equals(ds.getSessionID())))
-            .count();
+    amountOfAllAttendees += databaseService.getRemovedMember();
 
     int currentAmountOfSessions = databaseService.getSessions().size();
     int currentAmountOfAttendees =
         databaseService.getSessions().stream()
             .collect(Collectors.summingInt(s -> s.getMembers().size())); // existing Sessions
     LOGGER.debug("<-- getAllData()");
-    return new ResponseEntity<AnalyticsData>(
+    return new ResponseEntity<>(
         new AnalyticsData(
             amountOfAllAttendees,
             amountOfAllSessions,
-            amountOfAttendeesLastMonth,
-            amountOfSessionsLastMonth,
             currentAmountOfAttendees,
             currentAmountOfSessions),
         HttpStatus.OK);

backend/src/main/java/io/diveni/backend/controller/WebsocketController.java

@@ -138,8 +138,6 @@ public void closeSession(AdminPrincipal principal) {
         ControllerUtils.getSessionOrThrowResponse(databaseService, principal.getSessionID());
     webSocketService.sendSessionStateToMembers(
         session.updateSessionState(SessionState.SESSION_CLOSED));
-    webSocketService.getSessionPrincipals(session.getSessionID()).memberPrincipals().stream()
-        .forEach(memberP -> removeMember(memberP));
     webSocketService.removeSession(session);
     databaseService.deleteSession(session);
     LOGGER.debug("<-- closeSession()");
@@ -295,4 +293,14 @@ public synchronized ResponseEntity<Long> getTimeValue(String memberID) throws Pa
     LOGGER.debug("<-- get-timer-value() + " + timeDifference);
     return new ResponseEntity<>(timeDifference, HttpStatus.OK);
   }
+
+  public boolean isMemberInSession(Principal principal) {
+    LOGGER.debug("--> isMemberInSession()");
+    if (principal instanceof MemberPrincipal) {
+      LOGGER.debug("<-- isMemberInSession()");
+      return databaseService.getSessionByMemberID(((MemberPrincipal) principal).getMemberID()).isPresent();
+    }
+    LOGGER.debug("<-- isMemberInSession(). principal is NOT instanceof MemberPrincipal");
+    return false;
+  }
 }

backend/src/main/java/io/diveni/backend/handler/SessionDisconnectedListener.java

@@ -25,7 +25,9 @@ public void onApplicationEvent(SessionDisconnectEvent event) {
     LOGGER.debug("--> onApplicationEvent()");
     var principal = event.getUser();
     if (principal instanceof MemberPrincipal) {
-      controller.removeMember(principal);
+      if (controller.isMemberInSession(principal)) {
+        controller.removeMember(principal);
+      }
     }
     LOGGER.debug("<-- onApplicationEvent()");
   }

backend/src/main/java/io/diveni/backend/model/AnalyticsData.java

@@ -16,10 +16,6 @@ public class AnalyticsData {
 
   private final int amountOfSessions;
 
-  private final int amountofAttendeesLastMonth;
-
-  private final int amountOfSessionsLastMonth;
-
   private final int amountOfAttendeesCurrently;
 
   private final int amountOfSessionsCurrently;

backend/src/main/java/io/diveni/backend/model/Statistic.java

@@ -0,0 +1,39 @@
+package io.diveni.backend.model;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.time.LocalDate;
+
+@Getter
+@AllArgsConstructor
+@EqualsAndHashCode
+@Document("statistics")
+public class Statistic {
+
+  @Id private String id;
+
+  private Integer overallSessions;
+
+  private Integer overallAttendees;
+
+  private final LocalDate creationTime;
+
+  public Statistic incrementOverallSessions() {
+    overallSessions++;
+    return this;
+  }
+
+  public Statistic incrementOverallAttendees() {
+    overallAttendees++;
+    return this;
+  }
+
+  public Statistic addOverallAttendees(int overallAttendees) {
+    this.overallAttendees += overallAttendees;
+    return this;
+  }
+}

backend/src/main/java/io/diveni/backend/repository/StatisticRepository.java

@@ -0,0 +1,8 @@
+package io.diveni.backend.repository;
+
+import io.diveni.backend.model.Statistic;
+import org.springframework.data.mongodb.repository.MongoRepository;
+
+public interface StatisticRepository extends MongoRepository<Statistic, String> {
+
+}

backend/src/main/java/io/diveni/backend/service/DatabaseService.java

@@ -5,63 +5,99 @@
 */
 package io.diveni.backend.service;
 
-import java.util.ArrayList;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
 import io.diveni.backend.model.Session;
-import io.diveni.backend.principals.MemberPrincipal;
+import io.diveni.backend.model.Statistic;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import io.diveni.backend.repository.SessionRepository;
+import io.diveni.backend.repository.StatisticRepository;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class DatabaseService {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseService.class);
+
+  //Sets the database entry identifier in our 'statistics' table.
+  //Only modify if you want to create a new database entry!!!
+  //Variable can be further extracted
+  private final String statEntryIdentifier = "STAT_V1";
+
   @Autowired SessionRepository sessionRepo;
 
-  private List<Session> deletedSessions = new ArrayList<>();
+  @Autowired StatisticRepository statisticRepo;
 
-  private List<MemberPrincipal> removedMembers = new ArrayList<>();
 
   public Optional<Session> getSessionByID(String sessionID) {
+    LOGGER.debug("getSessionByID()");
     return Optional.ofNullable(sessionRepo.findBySessionID(sessionID));
   }
 
   public Optional<Session> getSessionByAdminCookie(UUID adminCookie) {
+    LOGGER.debug("getSessionByAdminCookie()");
     return Optional.ofNullable(sessionRepo.findByAdminCookie(adminCookie));
   }
 
   public Optional<Session> getSessionByMemberID(String memberID) {
+    LOGGER.debug("getSessionByMemberID()");
     return sessionRepo.findByMemberID(memberID);
   }
 
   public List<Session> getSessions() {
+    LOGGER.debug("getSessions()");
     return sessionRepo.findAll();
   }
 
   public Session saveSession(Session session) {
+    LOGGER.debug("saveSession()");
     return sessionRepo.save(session.setLastModified(new Date()));
   }
 
+  @Transactional
   public void deleteSession(Session session) {
-    deletedSessions.add(session);
+    LOGGER.debug("--> deleteSession()");
+    Statistic statistic = getOrCreateStatistic();
+    statistic.incrementOverallSessions().addOverallAttendees(session.getMembers().size());
+    statisticRepo.save(statistic);
     sessionRepo.delete(session);
+    LOGGER.debug("<-- deleteSession()");
+  }
+
+  public void addRemovedMember()  {
+    LOGGER.debug("--> addRemovedMember()");
+    Statistic statistic = getOrCreateStatistic();
+    statistic.incrementOverallAttendees();
+    statisticRepo.save(statistic);
+    LOGGER.debug("<-- addRemovedMember()");
   }
 
-  public void addRemovedMember(MemberPrincipal removedMember) {
-    this.removedMembers.add(removedMember);
+  public Integer getRemovedMember() {
+    LOGGER.debug("getRemovedMember()");
+    return statisticRepo.findById(statEntryIdentifier)
+      .map(Statistic::getOverallAttendees)
+      .orElse(0);
   }
 
-  public List<MemberPrincipal> getRemovedMember() {
-    return this.removedMembers;
+  public Integer getDeletedSessions() {
+    LOGGER.debug("getDeletedSessions()");
+    return statisticRepo.findById(statEntryIdentifier)
+      .map(Statistic::getOverallSessions)
+      .orElse(0);
   }
 
-  public List<Session> getDeletedSessions() {
-    return this.deletedSessions;
+  private Statistic getOrCreateStatistic() {
+    LOGGER.debug("getOrCreateStatistic()");
+    return statisticRepo.findById(statEntryIdentifier)
+      .orElseGet(() -> statisticRepo.save(new Statistic(statEntryIdentifier, 0, 0, LocalDate.now())));
   }
 }

backend/src/main/java/io/diveni/backend/service/WebSocketService.java

@@ -109,7 +109,7 @@ public synchronized void removeMember(MemberPrincipal member) {
                   else return p;
                 })
             .collect(Collectors.toList());
-    databaseService.addRemovedMember(member);
+    databaseService.addRemovedMember();
     LOGGER.debug("<-- removeMember()");
   }