List companies (#13)

* change Query parameter

* Add id to CompanyRepresentation

* Add delete company

Author: carlosthe19916

src/main/java/io/github/project/openubl/xsender/idm/CompanyRepresentation.java

@@ -20,10 +20,14 @@
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
 
 @RegisterForReflection
 public class CompanyRepresentation {
 
+    private String id;
+
+    @Pattern(regexp = "[a-z0-9]([-a-z0-9]*[a-z0-9])?", message = "label must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character (e.g. 'my-name', or '123-abc')")
     @NotNull
     private String name;
 
@@ -35,6 +39,14 @@ public class CompanyRepresentation {
     @Valid
     private SunatCredentialsRepresentation credentials;
 
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public String getName() {
         return name;
     }

src/main/java/io/github/project/openubl/xsender/managers/CompanyManager.java

@@ -44,7 +44,7 @@ public CompanyEntity createCompany(String owner, CompanyRepresentation rep) {
         companyEntity.setId(UUID.randomUUID().toString());
 
         companyEntity.setOwner(owner);
-        companyEntity.setName(rep.getName());
+        companyEntity.setName(rep.getName().toLowerCase());
 
         if (rep.getWebServices() != null) {
             SunatUrlsEntity sunatUrlsEntity = new SunatUrlsEntity();

src/main/java/io/github/project/openubl/xsender/models/utils/EntityToRepresentation.java

@@ -41,6 +41,7 @@ private EntityToRepresentation() {
     public static CompanyRepresentation toRepresentation(CompanyEntity entity) {
         CompanyRepresentation rep = new CompanyRepresentation();
 
+        rep.setId(entity.getId());
         rep.setName(entity.getName());
 
         if (entity.getSunatUrls() != null) {

src/main/java/io/github/project/openubl/xsender/resources/CompanyResource.java

@@ -50,6 +50,9 @@ CompanyRepresentation updateCompany(
             @NotNull @Valid CompanyRepresentation rep
     );
 
+    @DELETE
+    @Path("/{company}")
+    void deleteCompany(@PathParam("company") @NotNull String company);
 
     /**
      * Change SUNAT credentials of a company

src/main/java/io/github/project/openubl/xsender/resources/CurrentUserResource.java

@@ -41,10 +41,10 @@ public interface CurrentUserResource {
     @GET
     @Path("/companies")
     PageRepresentation<CompanyRepresentation> getCompanies(
-            @QueryParam("name") String name,
+            @QueryParam("filterText") String filterText,
             @QueryParam("offset") @DefaultValue("0") Integer offset,
             @QueryParam("limit") @DefaultValue("10") Integer limit,
-            @QueryParam("sort_by") @DefaultValue("name") List<String> sortBy
+            @QueryParam("sort_by") List<String> sortBy
     );
 }
 

src/main/java/io/github/project/openubl/xsender/resources/DefaultCompanyResource.java

@@ -67,17 +67,23 @@ public class DefaultCompanyResource implements CompanyResource {
     @Inject
     CompanyManager companyManager;
 
-    public CompanyRepresentation getCompany(String org) {
-        CompanyEntity organizationEntity = companyRepository.findByName(org).orElseThrow(NotFoundException::new);
+    public CompanyRepresentation getCompany(String company) {
+        CompanyEntity organizationEntity = companyRepository.findByName(company).orElseThrow(NotFoundException::new);
         return EntityToRepresentation.toRepresentation(organizationEntity);
     }
 
-    public CompanyRepresentation updateCompany(String org, CompanyRepresentation rep) {
-        CompanyEntity organizationEntity = companyRepository.findByName(org).orElseThrow(NoClassDefFoundError::new);
+    public CompanyRepresentation updateCompany(String company, CompanyRepresentation rep) {
+        CompanyEntity organizationEntity = companyRepository.findByName(company).orElseThrow(NotFoundException::new);
         organizationEntity = companyManager.updateCompany(rep, organizationEntity);
         return EntityToRepresentation.toRepresentation(organizationEntity);
     }
 
+    @Override
+    public void deleteCompany(@NotNull String company) {
+        CompanyEntity organizationEntity = companyRepository.findByName(company).orElseThrow(NotFoundException::new);
+        companyRepository.deleteById(organizationEntity.getId());
+    }
+
     public void updateCompanySUNATCredentials(String org, SunatCredentialsRepresentation rep) {
         CompanyEntity organizationEntity = companyRepository.findByName(org).orElseThrow(NoClassDefFoundError::new);
         companyManager.updateCorporateCredentials(rep, organizationEntity);

src/main/java/io/github/project/openubl/xsender/resources/DefaultCurrentUserResource.java

@@ -73,7 +73,7 @@ public Response createCompany(CompanyRepresentation rep) {
     }
 
     public PageRepresentation<CompanyRepresentation> getCompanies(
-            String name,
+            String filterText,
             Integer offset,
             Integer limit,
             List<String> sortBy
@@ -87,15 +87,15 @@ public PageRepresentation<CompanyRepresentation> getCompanies(
         List<SortBean> sortBeans = ResourceUtils.getSortBeans(sortBy, CompanyRepository.SORT_BY_FIELDS);
 
         PageModel<CompanyEntity> pageModel;
-        if (name != null && !name.trim().isEmpty()) {
-            pageModel = CompanyRepository.list(contextBean.getUsername(), name, pageBean, sortBeans);
+        if (filterText != null && !filterText.trim().isEmpty()) {
+            pageModel = CompanyRepository.list(contextBean.getUsername(), filterText, pageBean, sortBeans);
         } else {
             pageModel = CompanyRepository.list(contextBean.getUsername(), pageBean, sortBeans);
         }
 
         List<NameValuePair> queryParameters = ResourceUtils.buildNameValuePairs(offset, limit, sortBeans);
-        if (name != null) {
-            queryParameters.add(new BasicNameValuePair("name", name));
+        if (filterText != null) {
+            queryParameters.add(new BasicNameValuePair("name", filterText));
         }
 
         try {

src/test/java/io/github/project/openubl/xsender/basic/resources/basic/DefaultCompanyResourceTest.java

@@ -0,0 +1,98 @@
+/**
+ * Copyright 2019 Project OpenUBL, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags.
+ *
+ * Licensed under the Eclipse Public License - v 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.github.project.openubl.xsender.basic.resources.basic;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.github.project.openubl.xsender.idm.CompanyRepresentation;
+import io.github.project.openubl.xsender.idm.SunatCredentialsRepresentation;
+import io.github.project.openubl.xsender.idm.SunatUrlsRepresentation;
+import io.github.project.openubl.xsender.models.jpa.CompanyRepository;
+import io.github.project.openubl.xsender.models.jpa.entities.CompanyEntity;
+import io.github.project.openubl.xsender.models.jpa.entities.SunatCredentialsEntity;
+import io.github.project.openubl.xsender.models.jpa.entities.SunatUrlsEntity;
+import io.github.project.openubl.xsender.security.UserIdentity;
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import javax.inject.Inject;
+import java.util.Optional;
+import java.util.UUID;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+@QuarkusTest
+public class DefaultCompanyResourceTest {
+
+    @Inject
+    CompanyRepository companyRepository;
+
+    @AfterEach
+    public void afterEach() {
+        companyRepository.deleteAll();
+    }
+
+    @Test
+    public void deleteCompany() throws JsonProcessingException {
+        // Given
+        final String COMPANY_NAME = "myCompany";
+
+        CompanyRepresentation company = CompanyRepresentation.Builder.aCompanyRepresentation()
+                .withName(COMPANY_NAME)
+                .withWebServices(SunatUrlsRepresentation.Builder.aSunatUrlsRepresentation()
+                        .withFactura("http://url1.com")
+                        .withGuia("http://url2.com")
+                        .withRetenciones("http://url3.com")
+                        .build()
+                )
+                .withCredentials(SunatCredentialsRepresentation.Builder.aSunatCredentialsRepresentation()
+                        .withUsername("myUsername")
+                        .withPassword("myPassword")
+                        .build()
+                )
+                .build();
+
+        String body = new ObjectMapper().writeValueAsString(company);
+
+        // When
+        given()
+                .body(body)
+                .header("Content-Type", "application/json")
+                .when()
+                .post("/api/user/companies")
+                .then()
+                .statusCode(200)
+                .body("name", is(company.getName().toLowerCase()));
+
+        // Then
+        Optional<CompanyEntity> companyOptional = companyRepository.findByName(COMPANY_NAME.toLowerCase());
+        assertTrue(companyOptional.isPresent());
+
+        CompanyEntity companyDB = companyOptional.get();
+        assertEquals(companyDB.getName(), COMPANY_NAME.toLowerCase());
+        assertEquals(companyDB.getOwner(), UserIdentity.DEFAULT_USERNAME);
+        assertEquals(companyDB.getSunatUrls().getSunatUrlFactura(), "http://url1.com");
+        assertEquals(companyDB.getSunatUrls().getSunatUrlGuiaRemision(), "http://url2.com");
+        assertEquals(companyDB.getSunatUrls().getSunatUrlPercepcionRetencion(), "http://url3.com");
+        assertEquals(companyDB.getSunatCredentials().getSunatUsername(), "myUsername");
+        assertEquals(companyDB.getSunatCredentials().getSunatPassword(), "myPassword");
+    }
+
+}

src/test/java/io/github/project/openubl/xsender/basic/resources/basic/DefaultCurrentUserResourceTest.java

@@ -51,7 +51,7 @@ public void afterEach() {
     }
 
     @Test
-    public void createCompany() throws JsonProcessingException {
+    public void createCompanyLowerCasingName() throws JsonProcessingException {
         // Given
         final String COMPANY_NAME = "myCompany";
 
@@ -80,14 +80,14 @@ public void createCompany() throws JsonProcessingException {
                 .post("/api/user/companies")
                 .then()
                 .statusCode(200)
-                .body("name", is(company.getName()));
+                .body("name", is(company.getName().toLowerCase()));
 
         // Then
-        Optional<CompanyEntity> companyOptional = companyRepository.findByName(COMPANY_NAME);
+        Optional<CompanyEntity> companyOptional = companyRepository.findByName(COMPANY_NAME.toLowerCase());
         assertTrue(companyOptional.isPresent());
 
         CompanyEntity companyDB = companyOptional.get();
-        assertEquals(companyDB.getName(), COMPANY_NAME);
+        assertEquals(companyDB.getName(), COMPANY_NAME.toLowerCase());
         assertEquals(companyDB.getOwner(), UserIdentity.DEFAULT_USERNAME);
         assertEquals(companyDB.getSunatUrls().getSunatUrlFactura(), "http://url1.com");
         assertEquals(companyDB.getSunatUrls().getSunatUrlGuiaRemision(), "http://url2.com");