#29 Perfil de Empleado Administrativo - LISTAR Documentos (correccionse)

src/main/java/com/primefactorsolutions/model/Document.java

@@ -13,6 +13,9 @@ public class Document extends BaseEntity {
     private String fileName;
     @Enumerated(EnumType.STRING)
     private DocumentType documentType;
+    @ManyToOne
+    @JoinColumn(name = "employee_id", nullable = false)
+    private Employee employee;
     @Lob
     @Column(columnDefinition = "BLOB")
     private byte[] fileData;

src/main/java/com/primefactorsolutions/service/DocumentService.java

@@ -2,20 +2,20 @@ package com.primefactorsolutions.service;
 
 import com.primefactorsolutions.model.Document;
 import com.primefactorsolutions.repositories.DocumentRepository;
+import lombok.AllArgsConstructor;
+import org.apache.commons.beanutils.BeanComparator;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 import java.util.Optional;
 
 @Service
+@AllArgsConstructor
 public class DocumentService {
     private final DocumentRepository documentRepository;
 
-    public DocumentService(final DocumentRepository documentRepository) {
-        this.documentRepository = documentRepository;
-    }
-
     public void saveDocument(final Document newDocument) {
         documentRepository.save(newDocument);
     }
@@ -24,7 +24,29 @@ public class DocumentService {
         return documentRepository.findAll();
     }
 
-    public Optional<Document> getDocumentById(final UUID id) {
+    public Document getDocument(final UUID id) {
-        return documentRepository.findById(id);
+        Optional<Document> employee = documentRepository.findById(id);
+        return employee.orElse(null);
+    }
+
+    public List<Document> findDocuments(
+            final int start, final int pageSize, final String sortProperty, final boolean asc) {
+        List<Document> documents = documentRepository.findAll();
+
+        int end = Math.min(start + pageSize, documents.size());
+        documents.sort(new BeanComparator<>(sortProperty));
+
+        if (!asc) {
+            Collections.reverse(documents);
+        }
+
+        return documents.subList(start, end);
+    }
+
+    public List<Document> findDocuments(final int start, final int pageSize) {
+        List<Document> employees = documentRepository.findAll();
+
+        int end = Math.min(start + pageSize, employees.size());
+        return employees.subList(start, end);
     }
 }

src/main/java/com/primefactorsolutions/service/EmployeeService.java

@@ -87,4 +87,8 @@ public class EmployeeService {
 
         ldapTemplate.modifyAttributes(buildDn(employee), new ModificationItem[] {item});
     }
+
+    public List<Employee> findAllEmployees() {
+        return employeeRepository.findAll();
+    }
 }

src/main/java/com/primefactorsolutions/views/DocumentView.java

@@ -0,0 +1,167 @@
+package com.primefactorsolutions.views;
+
+import com.primefactorsolutions.model.Document;
+import com.primefactorsolutions.model.DocumentType;
+import com.primefactorsolutions.model.Employee;
+import com.primefactorsolutions.service.DocumentService;
+import com.primefactorsolutions.service.EmployeeService;
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.combobox.ComboBox;
+import com.vaadin.flow.component.html.H2;
+import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.component.upload.Upload;
+import com.vaadin.flow.component.upload.receivers.MemoryBuffer;
+import com.vaadin.flow.router.*;
+import com.vaadin.flow.spring.annotation.SpringComponent;
+import jakarta.annotation.security.PermitAll;
+import org.springframework.context.annotation.Scope;
+import org.vaadin.firitin.form.BeanValidationForm;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+
+@SpringComponent
+@PermitAll
+@Scope("prototype")
+@PageTitle("Document")
+@Route(value = "/documents/:documentId?/:action?", layout = MainLayout.class)
+public class DocumentView extends BeanValidationForm<Document> implements HasUrlParameter<String> {
+
+    private final H2 title = new H2("Edit Documents");
+    private final TextField fileName = new TextField("Document Name");
+    private final ComboBox<DocumentType> documentType = new ComboBox<>("Document Type");
+    private final ComboBox<Employee> employeeComboBox = new ComboBox<>("Employee");
+    private final MemoryBuffer buffer = new MemoryBuffer();
+    private final Upload uploadButton = new Upload(buffer);
+    private final DocumentService documentService;
+    private final EmployeeService employeeService;
+    private boolean fileUploaded = false;
+
+    public DocumentView(final DocumentService documentService, final EmployeeService employeeService) {
+        super(Document.class);
+        this.documentService = documentService;
+        this.employeeService = employeeService;
+        initializeView();
+    }
+
+    private void initializeView() {
+        setFileNameProperties();
+        setDocumentTypeProperties();
+        setEmployeeComboBoxProperties();
+        setUploadButtonProperties();
+    }
+
+    private void setFileNameProperties() {
+        fileName.setWidthFull();
+    }
+
+    private void setDocumentTypeProperties() {
+        documentType.setItems(DocumentType.values());
+        documentType.setWidthFull();
+    }
+
+    private void setEmployeeComboBoxProperties() {
+        List<Employee> employees = employeeService.findAllEmployees();
+        employeeComboBox.setItems(employees);
+        employeeComboBox.setItemLabelGenerator(employee -> employee.getFirstName() + " " + employee.getLastName());
+        employeeComboBox.setWidthFull();
+    }
+
+    private void setUploadButtonProperties() {
+        uploadButton.setMaxFiles(1);
+        uploadButton.setAcceptedFileTypes(".pdf");
+        uploadButton.addSucceededListener(event -> handleUploadSuccess());
+    }
+
+    protected  Button createSaveButton() {
+        Button saveButton = new Button("Save");
+        saveButton.addClickListener(event -> saveDocument());
+        return saveButton;
+    }
+
+    protected  Button createCloseButton() {
+        Button closeButton = new Button("Close");
+        closeButton.addClickListener(event -> closeForm());
+        return closeButton;
+    }
+
+
+    private void closeForm() {
+        navigateToDocumentsListView();
+    }
+
+    private void navigateToDocumentsListView() {
+        getUI().ifPresent(ui -> ui.navigate(DocumentsListView.class));
+    }
+
+    private void handleUploadSuccess() {
+        fileUploaded = true;
+        Notification.show("File uploaded successfully.");
+    }
+
+    private void saveDocument() {
+        if (isFormValid()) {
+            Document document = createDocument();
+            document.setEmployee(employeeComboBox.getValue());
+            documentService.saveDocument(document);
+            Notification.show("File saved successfully.");
+            clearForm();
+        } else {
+            Notification.show("Save failed: Please complete all fields and upload a file.");
+        }
+    }
+
+    private boolean isFormValid() {
+        return !fileName.isEmpty()
+                && documentType.getValue() != null
+                && employeeComboBox.getValue() != null
+                && fileUploaded;
+    }
+
+    private Document createDocument() {
+        Document document = new Document();
+        document.setFileName(fileName.getValue());
+        document.setDocumentType(documentType.getValue());
+        document.setFileData(readFileData());
+        return document;
+    }
+
+    private byte[] readFileData() {
+        try {
+            return buffer.getInputStream().readAllBytes();
+        } catch (IOException e) {
+            Notification.show("Error reading file data.");
+            return new byte[0];
+        }
+    }
+
+    private void clearForm() {
+        fileName.clear();
+        documentType.clear();
+        employeeComboBox.clear();
+        fileUploaded = false;
+    }
+
+
+    @Override
+    public void setParameter(final BeforeEvent beforeEvent, final String action) {
+        final RouteParameters params = beforeEvent.getRouteParameters();
+        final String s = params.get("documentId").orElse(null);
+
+        if ("new".equals(action)) {
+            setEntityWithEnabledSave(new Document());
+        } else {
+            UUID documentId = UUID.fromString(s);
+            var document = documentService.getDocument(documentId);
+            setEntityWithEnabledSave(document);
+        }
+    }
+
+    @Override
+    protected List<Component> getFormComponents() {
+        return List.of(title, fileName, documentType, employeeComboBox, uploadButton, createCloseButton());
+    }
+}

src/main/java/com/primefactorsolutions/views/DocumentsListView.java

@@ -0,0 +1,143 @@
+package com.primefactorsolutions.views;
+
+import com.primefactorsolutions.model.Document;
+import com.primefactorsolutions.model.DocumentType;
+import com.primefactorsolutions.model.Employee;
+import com.primefactorsolutions.service.DocumentService;
+import com.primefactorsolutions.service.EmployeeService;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.combobox.ComboBox;
+import com.vaadin.flow.component.grid.GridSortOrder;
+import com.vaadin.flow.component.html.Main;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.data.provider.SortDirection;
+import com.vaadin.flow.router.PageTitle;
+import com.vaadin.flow.router.Route;
+import com.vaadin.flow.spring.annotation.SpringComponent;
+import jakarta.annotation.security.PermitAll;
+import org.springframework.context.annotation.Scope;
+import org.vaadin.firitin.components.grid.PagingGrid;
+
+import java.util.List;
+
+
+@SpringComponent
+@Scope("prototype")
+@PageTitle("Documents")
+@Route(value = "/documents", layout = MainLayout.class)
+@PermitAll
+public class DocumentsListView extends Main {
+
+    private final DocumentService documentService;
+    private final EmployeeService employeeService;
+    private final PagingGrid<Document> documentGrid = new PagingGrid<>(Document.class);
+
+    public DocumentsListView(final DocumentService documentService, final EmployeeService employeeService) {
+        this.documentService = documentService;
+        this.employeeService = employeeService;
+        initializeView();
+        updateDocumentGrid();
+    }
+
+    private void initializeView() {
+        configureDocumentGrid();
+        add(createActionButton("Add Document", this::navigateToAddDocumentView));
+        add(createDocumentTypeFilter());
+        add(createEmployeeFilter());
+        add(documentGrid);
+    }
+
+    private void configureDocumentGrid() {
+        documentGrid.setColumns("fileName", "documentType");
+        documentGrid.addComponentColumn(this::createEmployeeSpan).setHeader("Employee");
+        addDocumentActionColumn("View", this::navigateToDocumentView);
+        addDocumentActionColumn("Edit", this::navigateToEditDocumentView);
+        addDocumentActionColumn("Download", this::navigateToDownloadDocumentView);
+        configurePagination();
+    }
+
+    private Span createEmployeeSpan(final Document document) {
+        Employee employee = document.getEmployee();
+        String employeeName = employee.getFirstName() + " " + employee.getLastName();
+        return new Span(employeeName);
+    }
+
+
+    private void addDocumentActionColumn(final String label, final DocumentActionHandler handler) {
+        documentGrid.addComponentColumn(document -> createActionButton(label, () -> handler.handle(document)));
+    }
+
+    private Button createActionButton(final String label, final Runnable onClickAction) {
+        Button actionButton = new Button(label);
+        actionButton.addClickListener(event -> onClickAction.run());
+        return actionButton;
+    }
+
+    private ComboBox<DocumentType> createDocumentTypeFilter() {
+        ComboBox<DocumentType> documentTypeFilter = new ComboBox<>("Document Type");
+        documentTypeFilter.setItems(DocumentType.values());
+        documentTypeFilter.addValueChangeListener(event -> updateDocumentGrid());
+        return documentTypeFilter;
+    }
+
+    private ComboBox<Employee> createEmployeeFilter() {
+        ComboBox<Employee> employeeFilter = new ComboBox<>("Employee");
+        List<Employee> employees = employeeService.findAllEmployees();
+        employeeFilter.setItems(employees);
+        employeeFilter.setItemLabelGenerator(employee -> employee.getFirstName() + " " + employee.getLastName());
+        employeeFilter.addValueChangeListener(event -> updateDocumentGrid());
+        return employeeFilter;
+    }
+
+    private void navigateToEditDocumentView(final Document document) {
+        navigateToDocumentView(document, "edit");
+    }
+
+    private void navigateToDocumentView(final Document document) {
+        navigateToDocumentView(document, "view");
+    }
+
+    private void navigateToDocumentView(final Document document, final String action) {
+        getUI().ifPresent(ui -> ui.navigate(DocumentView.class, document.getId().toString() + "/" + action));
+    }
+
+    private void navigateToDownloadDocumentView(final Document document) {
+        // No operation
+    }
+
+    private void navigateToAddDocumentView() {
+        getUI().ifPresent(ui -> ui.navigate(DocumentView.class, "new"));
+    }
+
+    private void configurePagination() {
+        documentGrid.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
+        documentGrid.setPageSize(5);
+    }
+
+    private void updateDocumentGrid() {
+        documentGrid.setPagingDataProvider((page, pageSize) -> fetchDocuments((int) page, pageSize));
+    }
+
+    private List<Document> fetchDocuments(final int page, final int size) {
+        int startIndex = page * size;
+        return isSortOrderPresent()
+                ? fetchSortedDocuments(startIndex, size)
+                : documentService.findDocuments(startIndex, size);
+    }
+
+    private boolean isSortOrderPresent() {
+        return !documentGrid.getSortOrder().isEmpty();
+    }
+
+    private List<Document> fetchSortedDocuments(final int start, final int pageSize) {
+        GridSortOrder<Document> sortOrder = documentGrid.getSortOrder().getFirst();
+        return documentService.findDocuments(start, pageSize,
+                sortOrder.getSorted().getKey(),
+                sortOrder.getDirection() == SortDirection.ASCENDING);
+    }
+
+    @FunctionalInterface
+    private interface DocumentActionHandler {
+        void handle(Document document);
+    }
+}

src/main/java/com/primefactorsolutions/views/DocumentsView.java

@@ -1,174 +0,0 @@
-package com.primefactorsolutions.views;
-
-import com.primefactorsolutions.model.Document;
-import com.primefactorsolutions.model.DocumentType;
-import com.primefactorsolutions.service.DocumentService;
-import com.vaadin.flow.component.Component;
-import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.dialog.Dialog;
-import com.vaadin.flow.component.html.Div;
-import com.vaadin.flow.component.html.H2;
-import com.vaadin.flow.component.html.IFrame;
-import com.vaadin.flow.component.html.Main;
-import com.vaadin.flow.component.notification.Notification;
-import com.vaadin.flow.component.orderedlayout.FlexComponent;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
-import com.vaadin.flow.component.orderedlayout.VerticalLayout;
-import com.vaadin.flow.component.upload.Upload;
-import com.vaadin.flow.component.upload.receivers.MemoryBuffer;
-import com.vaadin.flow.router.PageTitle;
-import com.vaadin.flow.router.Route;
-import com.vaadin.flow.spring.annotation.SpringComponent;
-import jakarta.annotation.security.PermitAll;
-import org.springframework.context.annotation.Scope;
-
-import java.io.IOException;
-import java.util.Base64;
-
-@SpringComponent
-@PermitAll
-@Scope("prototype")
-@PageTitle("Documents")
-@Route(value = "/documents/me", layout = MainLayout.class)
-public abstract class DocumentsView extends Main {
-    private final DocumentService documentService;
-    private final MemoryBuffer buffer = new MemoryBuffer();
-    private String lastUploadedFileName = null;
-
-    public DocumentsView(final DocumentService documentService) {
-        this.documentService = documentService;
-        initializeLayout();
-    }
-
-    protected abstract void initializeLayout();
-
-    protected HorizontalLayout createRow(
-            final String title1,
-            final DocumentType type1,
-            final String title2,
-            final DocumentType type2) {
-
-        HorizontalLayout row = new HorizontalLayout();
-        row.add(
-                createDocumentSection(title1, type1),
-                createDocumentSection(title2, type2)
-        );
-        return row;
-    }
-
-    protected HorizontalLayout createRow(final String title1, final DocumentType type1) {
-        HorizontalLayout row = new HorizontalLayout();
-        row.add(createDocumentSection(title1, type1));
-        return row;
-    }
-
-    private Div createDocumentSection(final String title, final DocumentType documentType) {
-        Div section = new Div();
-        section.add(new H2(title));
-
-        Upload upload = createUploadComponent();
-        Button viewButton = createViewButton(documentType);
-        Button saveButton = createSaveButton(viewButton, documentType);
-
-        section.add(createLayout(upload),
-                createLayout(viewButton, new Button("Edit"), saveButton),
-                createAdditionalButtons());
-        return section;
-    }
-
-    private Upload createUploadComponent() {
-        Upload upload = new Upload(buffer);
-        upload.setMaxFiles(1);
-        upload.setAcceptedFileTypes(".pdf");
-        upload.addSucceededListener(event -> handleUploadSuccess(event.getFileName()));
-        return upload;
-    }
-
-    private Button createViewButton(final DocumentType documentType) {
-        Button viewButton = new Button("View");
-        viewButton.setEnabled(documentExists(documentType));
-        viewButton.addClickListener(event -> viewDocument(documentType));
-        return viewButton;
-    }
-
-    private Button createSaveButton(final Button viewButton, final DocumentType documentType) {
-        Button saveButton = new Button("Save");
-        saveButton.addClickListener(event -> saveFile(documentType, viewButton));
-        return saveButton;
-    }
-
-    private void handleUploadSuccess(final String fileName) {
-        lastUploadedFileName = fileName;
-        Notification.show("File uploaded successfully");
-    }
-
-    private HorizontalLayout createLayout(final Component... components) {
-        if (components.length != 1 && components.length != 3) {
-            throw new IllegalArgumentException("This method only accepts 1 or 3 components.");
-        }
-        HorizontalLayout layout = new HorizontalLayout(components);
-        layout.setJustifyContentMode(FlexComponent.JustifyContentMode.CENTER);
-        return layout;
-    }
-
-    private HorizontalLayout createAdditionalButtons() {
-        return createLayout(new Button("Print"), new Button("Download"), new Button("Delete"));
-    }
-
-    private void saveFile(final DocumentType documentType, final Button viewButton) {
-        if (lastUploadedFileName == null) {
-            Notification.show("Please upload a file first.");
-            return;
-        }
-        try {
-            byte[] content = buffer.getInputStream().readAllBytes();
-            documentService.saveDocument(new Document(lastUploadedFileName, documentType, content));
-            Notification.show("File saved successfully.");
-            viewButton.setEnabled(true);
-        } catch (IOException e) {
-            Notification.show("Error saving file: " + e.getMessage());
-        }
-    }
-
-    private boolean documentExists(final DocumentType documentType) {
-        return documentService.getAllDocuments().stream()
-                .anyMatch(doc -> doc.getDocumentType() == documentType);
-    }
-
-    private void viewDocument(final DocumentType documentType) {
-        documentService.getAllDocuments().stream()
-                .filter(doc -> doc.getDocumentType() == documentType)
-                .findFirst()
-                .ifPresentOrElse(this::showPdfDialog, () -> Notification.show("Document not found."));
-    }
-
-    private void showPdfDialog(final Document document) {
-        Dialog dialog = createDialog(document.getFileData());
-        dialog.open();
-    }
-
-    private Dialog createDialog(final byte[] fileData) {
-        Dialog dialog = new Dialog();
-        dialog.setModal(true);
-        dialog.setCloseOnEsc(true);
-        dialog.setCloseOnOutsideClick(true);
-
-        IFrame pdfFrame = new IFrame();
-        pdfFrame.setSrc(createPdfResource(fileData));
-        pdfFrame.setWidth("800px");
-        pdfFrame.setHeight("600px");
-
-        Button closeButton = new Button("Close", event -> dialog.close());
-        VerticalLayout layout = new VerticalLayout(pdfFrame, closeButton);
-        layout.setAlignItems(FlexComponent.Alignment.CENTER);
-
-        dialog.add(layout);
-        return dialog;
-    }
-
-    private String createPdfResource(final byte[] fileData) {
-        return "data:application/pdf;base64," + Base64.getEncoder().encodeToString(fileData);
-    }
-
-}
-

src/main/java/com/primefactorsolutions/views/MainLayout.java

@@ -18,9 +18,7 @@ import com.vaadin.flow.theme.lumo.LumoUtility;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.vaadin.lineawesome.LineAwesomeIcon;
 
-/**
+
- * The main view is a top-level placeholder for other views.
- */
 public class MainLayout extends AppLayout {
     private final transient AuthenticationContext authContext;
 
@@ -81,9 +79,9 @@ public class MainLayout extends AppLayout {
 
             SideNavItem admin = new SideNavItem("Admin", MainView.class,
                     LineAwesomeIcon.SUPERSCRIPT_SOLID.create());
-            admin.addItem(new SideNavItem("Employees", EmployeeView.class,
+//            admin.addItem(new SideNavItem("Employees", EmployeeView.class,
-                    LineAwesomeIcon.USER_EDIT_SOLID.create()));
+//                    LineAwesomeIcon.USER_EDIT_SOLID.create()));
-            admin.addItem(new SideNavItem("Documents", DocumentsView.class,
+            admin.addItem(new SideNavItem("Documents", DocumentsListView.class,
                     LineAwesomeIcon.FILE_ALT_SOLID.create()));
 
             SideNavItem timeOff = new SideNavItem("My Time-off", TimeoffView.class,