MyINPulse-back/build.gradle

@@ -27,7 +27,6 @@ dependencies {
     implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
     implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
     implementation 'org.postgresql:postgresql'
-    implementation group: 'com.itextpdf', name: 'itextpdf', version: '5.5.13.3'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'com.h2database:h2'

MyINPulse-back/src/main/java/enseirb/myinpulse/controller/AdminApi.java

@@ -81,7 +81,7 @@ public class AdminApi {
      */
     @PostMapping("/admin/appoitements/report/{appointmentId}")
     public void createAppointmentReport(
-            @PathVariable long appointmentId,
+            @PathVariable String appointmentId,
             @RequestBody Report report,
             @AuthenticationPrincipal Jwt principal) {
         adminApiService.createAppointmentReport(

MyINPulse-back/src/main/java/enseirb/myinpulse/controller/SharedApi.java

@@ -1,6 +1,5 @@
 package enseirb.myinpulse.controller;
 
-import com.itextpdf.text.DocumentException;
 import enseirb.myinpulse.model.*;
 import enseirb.myinpulse.service.SharedApiService;
 
@@ -10,9 +9,6 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-
 @SpringBootApplication
 @RestController
 public class SharedApi {
@@ -82,11 +78,7 @@ public class SharedApi {
     @GetMapping("/shared/projects/appointments/report/{appointmentId}")
     public void getPDFReport(
             @PathVariable int appointmentId, @AuthenticationPrincipal Jwt principal) {
-        try {
+        sharedApiService.getPDFReport(appointmentId, principal.getClaimAsString("email"));
-            sharedApiService.getPDFReport(appointmentId, principal.getClaimAsString("email"));
-        } catch (FileNotFoundException | DocumentException e) {
-            System.out.println(e);
-        }
     }
 
     /**

MyINPulse-back/src/main/java/enseirb/myinpulse/model/Appointment.java

@@ -115,8 +115,4 @@ public class Appointment {
     public Report getAppointmentReport() {
         return report;
     }
-
-    public void setAppointmentReport(Report report) {
-        this.report = report;
-    }
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/model/Report.java

@@ -37,12 +37,4 @@ public class Report {
     public void setReportContent(String reportContent) {
         this.reportContent = reportContent;
     }
-
-    public Appointment getAppointmentReport() {
-        return appointmentReport;
-    }
-
-    public void setAppointmentReport(Appointment appointmentReport) {
-        this.appointmentReport = appointmentReport;
-    }
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/service/AdminApiService.java

@@ -7,12 +7,6 @@ import enseirb.myinpulse.model.*;
 import enseirb.myinpulse.service.database.AdministratorService;
 import enseirb.myinpulse.service.database.ProjectService;
 import enseirb.myinpulse.service.database.UserService;
-import enseirb.myinpulse.service.database.AppointmentService;
-import enseirb.myinpulse.service.database.ReportService;
-import enseirb.myinpulse.service.UtilsService;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -22,41 +16,29 @@ import org.springframework.web.server.ResponseStatusException;
 @Service
 public class AdminApiService {
 
-    protected static final Logger logger = LogManager.getLogger();
-
     private final ProjectService projectService;
     private final UserService userService;
     private final AdministratorService administratorService;
-    private final UtilsService utilsService;
-    private final AppointmentService appointmentService;
-    private final ReportService reportService;
 
     @Autowired
     AdminApiService(
             ProjectService projectService,
             UserService userService,
-            AdministratorService administratorService,
+            AdministratorService administratorService) {
-            UtilsService utilsService,
-            AppointmentService appointmentService,
-            ReportService reportService) {
         this.projectService = projectService;
         this.userService = userService;
         this.administratorService = administratorService;
-        this.utilsService = utilsService;
-        this.appointmentService = appointmentService;
-        this.reportService = reportService;
     }
 
     // TODO: check if tests are sufficients - peer verification required
-    public Iterable<Project> getProjectsOfAdmin(String mail) {
+    public Iterable<Project> getProjectsOfAdmin(String email) {
         return projectService.getProjectsByAdminId(
                 administratorService.getAdministratorById(
-                        this.userService.getUserByEmail(mail).getIdUser()));
+                        this.userService.getUserByEmail(email).getIdUser()));
     }
 
     // TODO
-    public Iterable<Appointment> getUpcomingAppointments(String mail) {
+    public Iterable<Appointment> getUpcomingAppointments(String email) {
-        logger.info("User {} check their upcoming appointments", mail);
         throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
     }
 
@@ -91,26 +73,9 @@ public class AdminApiService {
         }
     }
 
-    public void createAppointmentReport(long appointmentId, Report report, String mail) {
+    // TODO
-        long projectId =
+    public void createAppointmentReport(String appointmentId, Report report, String email) {
-                this.appointmentService
+        throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
-                        .getAppointmentById(appointmentId)
-                        .getAppointmentListSectionCell()
-                        .getFirst()
-                        .getProjectSectionCell()
-                        .getIdProject();
-        if (!utilsService.isAllowedToCheckProject(mail, projectId)) {
-            logger.warn(
-                    "User {} tried to add an report for appointment {} but is not allowed to.",
-                    mail,
-                    projectId);
-            throw new ResponseStatusException(
-                    HttpStatus.UNAUTHORIZED, "You're not allowed to check this project");
-        }
-        logger.info("User {} added a report for appointment {}", mail, projectId);
-        Report addedReport = this.reportService.addNewReport(report);
-        addedReport.setAppointmentReport(this.appointmentService.getAppointmentById(appointmentId));
-        this.appointmentService.getAppointmentById(appointmentId).setAppointmentReport(addedReport);
     }
 
     // TODO: test

MyINPulse-back/src/main/java/enseirb/myinpulse/service/SharedApiService.java

@@ -10,11 +10,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.server.ResponseStatusException;
 
-import com.itextpdf.text.*;
-import com.itextpdf.text.pdf.PdfWriter;
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -123,9 +118,8 @@ public class SharedApiService {
         return appointments;
     }
 
-    //
+    // TODO
-    public void getPDFReport(long appointmentId, String mail)
+    public void getPDFReport(long appointmentId, String mail) {
-            throws FileNotFoundException, DocumentException {
         long projectId =
                 this.appointmentService
                         .getAppointmentById(appointmentId)
@@ -145,82 +139,15 @@ public class SharedApiService {
             throw new ResponseStatusException(
                     HttpStatus.UNAUTHORIZED, "You're not allowed to check this project");
         }
-        logger.info(
+        /* return this.appointmentService
-                "User {} generated the PDF report related to appointment {}", mail, appointmentId);
+        .getAppointmentById(appointmentId)
-
+        .getAppointmentReport().getReportContent(); */
-        String reportContent =
+        // generate pdf from this string, and format it to be decent looking
-                this.appointmentService
+        throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
-                        .getAppointmentById(appointmentId)
-                        .getAppointmentReport()
-                        .getReportContent();
-
-        // PDF generation
-        Document document = new Document();
-        PdfWriter.getInstance(document, new FileOutputStream("Report" + appointmentId + ".pdf"));
-        document.open();
-
-        Paragraph title =
-                new Paragraph(
-                        new Phrase(
-                                "Compte Rendu - Réunion du "
-                                        + this.appointmentService
-                                                .getAppointmentById(appointmentId)
-                                                .getAppointmentDate()
-                                                .toString(),
-                                FontFactory.getFont(
-                                        FontFactory.HELVETICA,
-                                        20,
-                                        Font.BOLDITALIC,
-                                        BaseColor.BLACK)));
-        title.setAlignment(Element.ALIGN_CENTER);
-        document.add(title);
-
-        Font subsection =
-                FontFactory.getFont(FontFactory.HELVETICA, 14, Font.UNDERLINE, BaseColor.DARK_GRAY);
-        Font body = FontFactory.getFont(FontFactory.COURIER, 12, BaseColor.BLACK);
-
-        String[] split = reportContent.split(" ");
-
-        String tmp = "";
-        int counter = 1;
-        for (String s : split) {
-            if (s.equals("//")) {
-                Chunk chunk = new Chunk(tmp, body);
-                document.add(chunk);
-                document.add(new Paragraph("\n"));
-                tmp = "";
-                Paragraph paragraph = new Paragraph("Point n°" + counter + " : ", subsection);
-                document.add(paragraph);
-                document.add(new Paragraph("\n"));
-                counter++;
-            } else {
-                tmp = tmp.concat(s + " ");
-            }
-        }
-        Chunk chunk = new Chunk(tmp, body);
-        document.add(chunk);
-        document.add(new Paragraph("\n"));
-
-        document.close();
     }
 
     // TODO
     public void createAppointmentRequest(Appointment appointment, String mail) {
-        long projectId =
+        throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
-                appointment
-                        .getAppointmentListSectionCell()
-                        .getFirst()
-                        .getProjectSectionCell()
-                        .getIdProject();
-        if (!utilsService.isAllowedToCheckProject(mail, projectId)) {
-            logger.warn(
-                    "User {} tried to create for the project {} but is not allowed to.",
-                    mail,
-                    projectId);
-            throw new ResponseStatusException(
-                    HttpStatus.UNAUTHORIZED, "You're not allowed to check this project");
-        }
-        logger.info("User {} tried to create an appointment for project {}", mail, projectId);
-        this.appointmentService.addNewAppointment(appointment);
     }
 }

documentation/Doc.txt

@@ -1,12 +0,0 @@
-Format des comptes rendus de réunion :
-Texte organisé par bullet point, chaque bullet point est séparé par "//" pour pouvoir être correctement généré.
-
-Exemple :
-Le texte "// blablabla // oui bonjour"
-donne le résultat
-
-Point n°1 :
-  blablabla
-
-Point n°2 :
-  oui bonjour