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

@@ -1,7 +1,6 @@
 package enseirb.myinpulse.controller;
 
 import com.itextpdf.text.DocumentException;
-
 import enseirb.myinpulse.model.*;
 import enseirb.myinpulse.service.SharedApiService;
 
@@ -11,8 +10,7 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.IOException;
+import java.io.FileNotFoundException;
-import java.net.URISyntaxException;
 
 @SpringBootApplication
 @RestController
@@ -85,12 +83,10 @@ public class SharedApi {
             @PathVariable int appointmentId, @AuthenticationPrincipal Jwt principal) {
         try {
             sharedApiService.getPDFReport(appointmentId, principal.getClaimAsString("email"));
+        } catch (FileNotFoundException e) {
+            System.out.println(e + "File not found");
         } catch (DocumentException e) {
             System.out.println(e + "Document exception");
-        } catch (URISyntaxException e) {
-            System.out.println(e + "Error with URI");
-        } catch (IOException e) {
-            System.out.println(e + "Failed to access file");
         }
     }
 

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

@@ -4,7 +4,11 @@ import static enseirb.myinpulse.model.ProjectDecisionValue.ACTIVE;
 import static enseirb.myinpulse.model.ProjectDecisionValue.REJECTED;
 
 import enseirb.myinpulse.model.*;
-import enseirb.myinpulse.service.database.*;
+import enseirb.myinpulse.service.database.AdministratorService;
+import enseirb.myinpulse.service.database.AppointmentService;
+import enseirb.myinpulse.service.database.ProjectService;
+import enseirb.myinpulse.service.database.ReportService;
+import enseirb.myinpulse.service.database.UserService;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -13,9 +17,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.server.ResponseStatusException;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Service
 public class AdminApiService {
 
@@ -27,7 +28,6 @@ public class AdminApiService {
     private final UtilsService utilsService;
     private final AppointmentService appointmentService;
     private final ReportService reportService;
-    private final SectionCellService sectionCellService;
 
     @Autowired
     AdminApiService(
@@ -36,15 +36,13 @@ public class AdminApiService {
             AdministratorService administratorService,
             UtilsService utilsService,
             AppointmentService appointmentService,
-            ReportService reportService,
+            ReportService reportService) {
-            SectionCellService sectionCellService) {
         this.projectService = projectService;
         this.userService = userService;
         this.administratorService = administratorService;
         this.utilsService = utilsService;
         this.appointmentService = appointmentService;
         this.reportService = reportService;
-        this.sectionCellService = sectionCellService;
     }
 
     // TODO: check if tests are sufficient - peer verification required
@@ -54,36 +52,10 @@ public class AdminApiService {
                         this.userService.getUserByEmail(mail).getIdUser()));
     }
 
+    // TODO
     public Iterable<Appointment> getUpcomingAppointments(String mail) {
         logger.info("User {} check their upcoming appointments", mail);
-        User user = this.userService.getUserByEmail(mail);
+        throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED, "Not implemented yet");
-        List<Appointment> appointments = new ArrayList<>();
-        if (user instanceof Administrator) {
-            List<Project> projects = new ArrayList<>(((Administrator) user).getListProject());
-            projects.forEach(
-                    project -> {
-                        project.getListSectionCell()
-                                .forEach(
-                                        sectionCell -> {
-                                            appointments.addAll(
-                                                    this.sectionCellService
-                                                            .getAppointmentsBySectionCellId(
-                                                                    sectionCell
-                                                                            .getIdSectionCell()));
-                                        });
-                    });
-        }
-        if (user instanceof Entrepreneur) {
-            Project project = ((Entrepreneur) user).getProjectParticipation();
-            project.getListSectionCell()
-                    .forEach(
-                            sectionCell -> {
-                                appointments.addAll(
-                                        this.sectionCellService.getAppointmentsBySectionCellId(
-                                                sectionCell.getIdSectionCell()));
-                            });
-        }
-        return appointments;
     }
 
     // TODO: check if tests are sufficient - peer verification required

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

@@ -13,14 +13,8 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.server.ResponseStatusException;
 
-import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -101,6 +95,7 @@ public class SharedApiService {
         return project.getProjectAdministrator();
     }
 
+    // TODO
     public Iterable<Appointment> getAppointmentsByProjectId(long projectId, String mail) {
         if (!utilsService.isAllowedToCheckProject(mail, projectId)) {
             logger.warn(
@@ -128,8 +123,9 @@ public class SharedApiService {
         return appointments;
     }
 
+    //
     public void getPDFReport(long appointmentId, String mail)
-            throws DocumentException, URISyntaxException, IOException {
+            throws FileNotFoundException, DocumentException {
         long projectId =
                 this.appointmentService
                         .getAppointmentById(appointmentId)
@@ -206,24 +202,9 @@ public class SharedApiService {
         document.add(new Paragraph("\n"));
 
         document.close();
-
-        // Replace uri with website address
-        Files.copy(
-                new URI(
-                                "http://localhost:8080/shared/projects/appointments/report/"
-                                        + appointmentId)
-                        .toURL()
-                        .openStream(),
-                Paths.get("Report" + appointmentId + ".pdf"),
-                StandardCopyOption.REPLACE_EXISTING);
-
-        // delete file, we don't want to stock all reports on the server
-        File file = new File("Report" + appointmentId + ".pdf");
-        if (!file.delete()) {
-            logger.warn("Failed to delete report {}", file.getAbsolutePath());
-        }
     }
 
+    // TODO
     public void createAppointmentRequest(Appointment appointment, String mail) {
         long projectId =
                 appointment