Add enhancements (#21)

carlosthe19916 · web-flow · commit b57e07669c48 · 2021-02-21T09:54:01.000+01:00
* Add enhancements

* Fix license

* upgrade testcontainer
diff --git a/pom.xml b/pom.xml
@@ -39,17 +39,17 @@
         <!--Quarkus-->
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
         <quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
-        <quarkus.platform.version>1.10.5.Final</quarkus.platform.version>
-        <quarkus-plugin.version>1.10.5.Final</quarkus-plugin.version>
+        <quarkus.platform.version>1.11.2.Final</quarkus.platform.version>
+        <quarkus-plugin.version>1.11.2.Final</quarkus-plugin.version>
 
         <!--plugings-->
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
         <surefire-plugin.version>2.22.1</surefire-plugin.version>
 
         <!--libs-->
         <xsender-lib.version>3.0.1.Final</xsender-lib.version>
-        <testcontainers.version>1.12.5</testcontainers.version>
-        <awaitility.version>3.0.0</awaitility.version>
+        <testcontainers.version>1.15.2</testcontainers.version>
+        <awaitility.version>4.0.3</awaitility.version>
         <keycloak.version>12.0.1</keycloak.version>
         <postgresql.version>13.1</postgresql.version>
 
diff --git a/src/main/java/io/github/project/openubl/xsender/idm/CompanyRepresentation.java b/src/main/java/io/github/project/openubl/xsender/idm/CompanyRepresentation.java
@@ -31,6 +31,8 @@ public class CompanyRepresentation {
     @NotNull
     private String name;
 
+    private String description;
+
     @NotNull
     @Valid
     private SunatUrlsRepresentation webServices;
@@ -55,6 +57,14 @@ public void setName(String name) {
         this.name = name;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     public SunatUrlsRepresentation getWebServices() {
         return webServices;
     }
@@ -73,6 +83,7 @@ public void setCredentials(SunatCredentialsRepresentation credentials) {
 
     public static final class Builder {
         private String name;
+        private String description;
         private SunatUrlsRepresentation webServices;
         private SunatCredentialsRepresentation credentials;
 
@@ -88,6 +99,11 @@ public Builder withName(String name) {
             return this;
         }
 
+        public Builder withDescription(String description) {
+            this.description = description;
+            return this;
+        }
+
         public Builder withWebServices(SunatUrlsRepresentation webServices) {
             this.webServices = webServices;
             return this;
@@ -101,6 +117,7 @@ public Builder withCredentials(SunatCredentialsRepresentation credentials) {
         public CompanyRepresentation build() {
             CompanyRepresentation companyRepresentation = new CompanyRepresentation();
             companyRepresentation.setName(name);
+            companyRepresentation.setDescription(description);
             companyRepresentation.setWebServices(webServices);
             companyRepresentation.setCredentials(credentials);
             return companyRepresentation;
diff --git a/src/main/java/io/github/project/openubl/xsender/managers/CompanyManager.java b/src/main/java/io/github/project/openubl/xsender/managers/CompanyManager.java
@@ -45,6 +45,7 @@ public CompanyEntity createCompany(String owner, CompanyRepresentation rep) {
 
         companyEntity.setOwner(owner);
         companyEntity.setName(rep.getName().toLowerCase());
+        companyEntity.setDescription(rep.getDescription());
 
         if (rep.getWebServices() != null) {
             SunatUrlsEntity sunatUrlsEntity = new SunatUrlsEntity();
@@ -67,16 +68,20 @@ public CompanyEntity createCompany(String owner, CompanyRepresentation rep) {
     /**
      * Shouldn't update 'name'
      */
-    public CompanyEntity updateCompany(CompanyRepresentation rep, CompanyEntity CompanyEntity) {
+    public CompanyEntity updateCompany(CompanyRepresentation rep, CompanyEntity entity) {
+        if (rep.getDescription() != null) {
+            entity.setDescription(rep.getDescription());
+        }
+
         if (rep.getWebServices() != null) {
-            if (CompanyEntity.getSunatUrls() == null) {
-                CompanyEntity.setSunatUrls(new SunatUrlsEntity());
+            if (entity.getSunatUrls() == null) {
+                entity.setSunatUrls(new SunatUrlsEntity());
             }
-            updateSunatUrls(rep.getWebServices(), CompanyEntity.getSunatUrls());
+            updateSunatUrls(rep.getWebServices(), entity.getSunatUrls());
         }
 
-        companyRepository.persist(CompanyEntity);
-        return CompanyEntity;
+        companyRepository.persist(entity);
+        return entity;
     }
 
     private void updateSunatUrls(SunatUrlsRepresentation rep, SunatUrlsEntity entity) {
diff --git a/src/main/java/io/github/project/openubl/xsender/managers/DocumentsManager.java b/src/main/java/io/github/project/openubl/xsender/managers/DocumentsManager.java
@@ -45,6 +45,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Optional;
+import java.util.UUID;
 
 @Transactional
 @ApplicationScoped
@@ -96,6 +97,7 @@ public UBLDocumentEntity createDocumentAndScheduleDelivery(
 
         // Create Entity in DB
         UBLDocumentEntity documentEntity = UBLDocumentEntity.Builder.anUBLDocumentEntity()
+                .withId(UUID.randomUUID().toString())
                 .withStorageFile(fileID)
                 .withFilename(fileNameWithoutExtension)
                 .withRuc(xmlContentModel.getRuc())
diff --git a/src/main/java/io/github/project/openubl/xsender/models/jpa/UBLDocumentRepository.java b/src/main/java/io/github/project/openubl/xsender/models/jpa/UBLDocumentRepository.java
@@ -17,15 +17,24 @@
 package io.github.project.openubl.xsender.models.jpa;
 
 import io.github.project.openubl.xsender.models.DeliveryStatusType;
+import io.github.project.openubl.xsender.models.PageBean;
+import io.github.project.openubl.xsender.models.PageModel;
+import io.github.project.openubl.xsender.models.SortBean;
+import io.github.project.openubl.xsender.models.jpa.entities.CompanyEntity;
 import io.github.project.openubl.xsender.models.jpa.entities.UBLDocumentEntity;
+import io.quarkus.hibernate.orm.panache.PanacheQuery;
 import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
+import io.quarkus.panache.common.Parameters;
+import io.quarkus.panache.common.Sort;
 
 import javax.enterprise.context.ApplicationScoped;
 import java.util.List;
 
 @ApplicationScoped
 public class UBLDocumentRepository implements PanacheRepositoryBase<UBLDocumentEntity, String> {
 
+    public static final String[] SORT_BY_FIELDS = {"documentID"};
+
     public List<UBLDocumentEntity> findAllScheduledToDeliver() {
         return list("deliveryStatus", DeliveryStatusType.SCHEDULED_TO_DELIVER);
     }
@@ -34,4 +43,38 @@ public List<UBLDocumentEntity> findAllSheduledToCheckTicket() {
         return list("deliveryStatus", DeliveryStatusType.SCHEDULED_CHECK_TICKET);
     }
 
+    public PageModel<UBLDocumentEntity> list(CompanyEntity company, PageBean pageBean, List<SortBean> sortBy) {
+        Sort sort = Sort.by();
+        sortBy.forEach(f -> sort.and(f.getFieldName(), f.isAsc() ? Sort.Direction.Ascending : Sort.Direction.Descending));
+
+        PanacheQuery<UBLDocumentEntity> query = CompanyEntity
+                .find(
+                        "From UBLDocumentEntity as d where d.company =:company",
+                        sort,
+                        Parameters.with("company", company)
+                )
+                .range(pageBean.getOffset(), pageBean.getOffset() + pageBean.getLimit() - 1);
+
+        long count = query.count();
+        List<UBLDocumentEntity> list = query.list();
+        return new PageModel<>(pageBean, count, list);
+    }
+
+    public PageModel<UBLDocumentEntity> list(CompanyEntity company, String filterText, PageBean pageBean, List<SortBean> sortBy) {
+        Sort sort = Sort.by();
+        sortBy.forEach(f -> sort.and(f.getFieldName(), f.isAsc() ? Sort.Direction.Ascending : Sort.Direction.Descending));
+
+        PanacheQuery<UBLDocumentEntity> query = CompanyEntity
+                .find(
+                        "From UBLDocumentEntity as d where d.company =:company and lower(d.documentID) like :filterText",
+                        sort,
+                        Parameters.with("company", company)
+                                .and("filterText", "%" + filterText.toLowerCase() + "%")
+                )
+                .range(pageBean.getOffset(), pageBean.getOffset() + pageBean.getLimit() - 1);
+
+        long count = query.count();
+        List<UBLDocumentEntity> list = query.list();
+        return new PageModel<>(pageBean, count, list);
+    }
 }
diff --git a/src/main/java/io/github/project/openubl/xsender/models/jpa/entities/CompanyEntity.java b/src/main/java/io/github/project/openubl/xsender/models/jpa/entities/CompanyEntity.java
@@ -44,6 +44,8 @@ public class CompanyEntity extends PanacheEntityBase {
     @Column(name = "NAME")
     private String name;
 
+    private String description;
+
     @NotNull
     @Valid
     @Embedded
@@ -82,6 +84,14 @@ public void setName(String name) {
         this.name = name;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     public SunatCredentialsEntity getSunatCredentials() {
         return sunatCredentials;
     }
@@ -123,6 +133,7 @@ public static final class Builder {
         private String id;
         private String owner;
         private String name;
+        private String description;
         private SunatCredentialsEntity sunatCredentials;
         private SunatUrlsEntity sunatUrls;
         private int version;
@@ -149,6 +160,11 @@ public Builder withName(String name) {
             return this;
         }
 
+        public Builder withDescription(String description) {
+            this.description = description;
+            return this;
+        }
+
         public Builder withSunatCredentials(SunatCredentialsEntity sunatCredentials) {
             this.sunatCredentials = sunatCredentials;
             return this;
@@ -169,6 +185,7 @@ public CompanyEntity build() {
             companyEntity.setId(id);
             companyEntity.setOwner(owner);
             companyEntity.setName(name);
+            companyEntity.setDescription(description);
             companyEntity.setSunatCredentials(sunatCredentials);
             companyEntity.setSunatUrls(sunatUrls);
             companyEntity.setVersion(version);
diff --git a/src/main/java/io/github/project/openubl/xsender/models/utils/EntityToRepresentation.java b/src/main/java/io/github/project/openubl/xsender/models/utils/EntityToRepresentation.java
@@ -40,6 +40,7 @@ public static CompanyRepresentation toRepresentation(CompanyEntity entity) {
 
         rep.setId(entity.getId());
         rep.setName(entity.getName());
+        rep.setDescription(entity.getDescription());
 
         if (entity.getSunatUrls() != null) {
             SunatUrlsRepresentation sunatUrlsRep = new SunatUrlsRepresentation();
diff --git a/src/main/java/io/github/project/openubl/xsender/resources/CompanyResource.java b/src/main/java/io/github/project/openubl/xsender/resources/CompanyResource.java
@@ -43,11 +43,11 @@ public interface CompanyResource {
     /**
      * Update an org
      */
-    @PATCH
+    @PUT
     @Path("/{company}")
     CompanyRepresentation updateCompany(
             @PathParam("company") @NotNull String company,
-            @NotNull @Valid CompanyRepresentation rep
+            @NotNull CompanyRepresentation rep
     );
 
     @DELETE
@@ -57,7 +57,7 @@ CompanyRepresentation updateCompany(
     /**
      * Change SUNAT credentials of a company
      */
-    @PATCH
+    @PUT
     @Path("/{company}/sunat-credentials")
     void updateCompanySUNATCredentials(
             @PathParam("company") @NotNull String company,
diff --git a/src/main/java/io/github/project/openubl/xsender/resources/DefaultCompanyResource.java b/src/main/java/io/github/project/openubl/xsender/resources/DefaultCompanyResource.java
@@ -23,13 +23,20 @@
 import io.github.project.openubl.xsender.idm.*;
 import io.github.project.openubl.xsender.managers.CompanyManager;
 import io.github.project.openubl.xsender.managers.DocumentsManager;
+import io.github.project.openubl.xsender.models.ContextBean;
+import io.github.project.openubl.xsender.models.PageBean;
+import io.github.project.openubl.xsender.models.PageModel;
+import io.github.project.openubl.xsender.models.SortBean;
 import io.github.project.openubl.xsender.models.jpa.CompanyRepository;
 import io.github.project.openubl.xsender.models.jpa.UBLDocumentRepository;
 import io.github.project.openubl.xsender.models.jpa.entities.CompanyEntity;
 import io.github.project.openubl.xsender.models.jpa.entities.UBLDocumentEntity;
 import io.github.project.openubl.xsender.models.utils.EntityToRepresentation;
+import io.github.project.openubl.xsender.resources.utils.ResourceUtils;
 import io.github.project.openubl.xsender.security.UserIdentity;
 import org.apache.commons.io.IOUtils;
+import org.apache.http.NameValuePair;
+import org.apache.http.message.BasicNameValuePair;
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.plugins.providers.multipart.InputPart;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
@@ -39,11 +46,15 @@
 import javax.transaction.Transactional;
 import javax.validation.constraints.NotNull;
 import javax.ws.rs.BadRequestException;
+import javax.ws.rs.InternalServerErrorException;
 import javax.ws.rs.NotFoundException;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URISyntaxException;
 import java.util.List;
 import java.util.Map;
 
@@ -53,6 +64,9 @@ public class DefaultCompanyResource implements CompanyResource {
 
     private static final Logger LOG = Logger.getLogger(DefaultCompanyResource.class);
 
+    @Context
+    UriInfo uriInfo;
+
     @Inject
     CompanyRepository companyRepository;
 
@@ -84,8 +98,8 @@ public CompanyRepresentation updateCompany(String company, CompanyRepresentation
 
     @Override
     public void deleteCompany(@NotNull String company) {
-        CompanyEntity organizationEntity = companyRepository.findByNameAndOwner(company, userIdentity.getUsername()).orElseThrow(NotFoundException::new);
-        companyRepository.deleteById(organizationEntity.getId());
+        CompanyEntity companyEntity = companyRepository.findByNameAndOwner(company, userIdentity.getUsername()).orElseThrow(NotFoundException::new);
+        companyRepository.deleteById(companyEntity.getId());
     }
 
     public void updateCompanySUNATCredentials(String org, SunatCredentialsRepresentation rep) {
@@ -95,7 +109,38 @@ public void updateCompanySUNATCredentials(String org, SunatCredentialsRepresenta
 
     @Override
     public PageRepresentation<DocumentRepresentation> listDocuments(@NotNull String company, String filterText, Integer offset, Integer limit, List<String> sortBy) {
-        return null;
+        CompanyEntity companyEntity = companyRepository.findByNameAndOwner(company, userIdentity.getUsername()).orElseThrow(NotFoundException::new);
+
+        ContextBean contextBean = ContextBean.Builder.aContextBean()
+                .withUsername(userIdentity.getUsername())
+                .withUriInfo(uriInfo)
+                .build();
+
+        PageBean pageBean = ResourceUtils.getPageBean(offset, limit);
+        List<SortBean> sortBeans = ResourceUtils.getSortBeans(sortBy, UBLDocumentRepository.SORT_BY_FIELDS);
+
+        PageModel<UBLDocumentEntity> pageModel;
+        if (filterText != null && !filterText.trim().isEmpty()) {
+            pageModel = documentRepository.list(companyEntity, filterText, pageBean, sortBeans);
+        } else {
+            pageModel = documentRepository.list(companyEntity, pageBean, sortBeans);
+        }
+
+        List<NameValuePair> queryParameters = ResourceUtils.buildNameValuePairs(offset, limit, sortBeans);
+        if (filterText != null) {
+            queryParameters.add(new BasicNameValuePair("name", filterText));
+        }
+
+        try {
+            return EntityToRepresentation.toRepresentation(
+                    pageModel,
+                    EntityToRepresentation::toRepresentation,
+                    contextBean.getUriInfo(),
+                    queryParameters
+            );
+        } catch (URISyntaxException e) {
+            throw new InternalServerErrorException();
+        }
     }
 
     @Override
