Merge pull request #17 from mcadecio/support-delete-rows

Implemented endpoint to delete rows from table

Author: mcadecio

component-tests/src/test/java/com/dercio/database_proxy/budgets/BudgetsRepository.java

@@ -1,7 +1,11 @@
 package com.dercio.database_proxy.budgets;
 
+import java.util.List;
+
 public interface BudgetsRepository {
 
+    List<Budget> find();
+
     Budget findById(long id);
 
     void save(Budget budget);

component-tests/src/test/java/com/dercio/database_proxy/budgets/BudgetsService.java

@@ -1,5 +1,6 @@
 package com.dercio.database_proxy.budgets;
 
+import com.dercio.database_proxy.common.RestService;
 import com.dercio.database_proxy.common.mapper.Mapper;
 import com.google.inject.Inject;
 import io.restassured.http.ContentType;
@@ -8,71 +9,18 @@
 
 import static io.restassured.RestAssured.given;
 
-@RequiredArgsConstructor(onConstructor_ = @Inject)
-public class BudgetsService {
+public class BudgetsService extends RestService {
 
-    private final Mapper mapper;
     private static final String BASE_URI = "http://localhost:8000";
     private static final String BUDGETS = "/budgets/";
 
-    public Response getBudgets() {
-        return given()
-                .baseUri(BASE_URI)
-                .accept(ContentType.JSON)
-                .log()
-                .all(true)
-                .get(BUDGETS)
-                .prettyPeek();
-    }
-
-    public Response getBudgetById(long id) {
-        return given()
-                .baseUri(BASE_URI)
-                .accept(ContentType.JSON)
-                .log()
-                .all(true)
-                .get(BUDGETS + id)
-                .prettyPeek();
-    }
-
-    public Response getBudgetById(String id) {
-        return given()
-                .baseUri(BASE_URI)
-                .accept(ContentType.JSON)
-                .log()
-                .all(true)
-                .get(BUDGETS + id)
-                .prettyPeek();
+    @Inject
+    public BudgetsService(Mapper mapper) {
+        super(BASE_URI, BUDGETS, mapper);
     }
 
     public Response createBudget(Budget budget) {
-        return given()
-                .baseUri(BASE_URI)
-                .contentType(ContentType.JSON)
-                .body(mapper.encode(budget))
-                .log()
-                .all(true)
-                .post(BUDGETS)
-                .prettyPeek();
+        return create(budget);
     }
 
-    public Response deleteBudget(Long id) {
-        return given()
-                .baseUri(BASE_URI)
-                .log()
-                .all(true)
-                .delete(BUDGETS + id)
-                .prettyPeek();
-    }
-
-    public Response updateBudget(Long originalId, Budget budget) {
-        return given()
-                .baseUri(BASE_URI)
-                .contentType(ContentType.JSON)
-                .body(mapper.encode(budget))
-                .log()
-                .all(true)
-                .put(BUDGETS + originalId)
-                .prettyPeek();
-    }
 }

component-tests/src/test/java/com/dercio/database_proxy/budgets/steps/DeleteBudgetsSteps.java

@@ -12,11 +12,13 @@
 import org.mybatis.guice.transactional.Transactional;
 
 import java.util.List;
+import java.util.Map;
 
 import static com.dercio.database_proxy.budgets.BudgetsFactory.createJanuaryBudget;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @ScenarioScoped
 public class DeleteBudgetsSteps {
@@ -47,7 +49,7 @@ public void theBudgetIPreviouslyCreatedIsNoLongerValid() {
 
     @When("I delete the budget")
     public void iDeleteTheBudget() {
-        response = budgetsService.deleteBudget(budgets.get(0).getId());
+        response = budgetsService.deleteById(budgets.get(0).getId());
     }
 
     @Then("the budget should be deleted")
@@ -59,7 +61,20 @@ public void theBudgetShouldBeDeleted() {
 
     @When("I delete a budget that does not exist")
     public void iDeleteABudgetThatDoesNotExist() {
-        response = budgetsService.deleteBudget(573489L);
+        response = budgetsService.deleteById(573489L);
+    }
+
+    @When("I delete the budgets by month {int}")
+    public void iDeleteTheBudgetsByMonth(int month) {
+        response = budgetsService.delete(Map.of("month", month));
+    }
+
+    @Then("bugdgets with month {int} should not exist")
+    public void budgetsWithMonthDoNotExist(int month) {
+        boolean result = budgetsRepository.find()
+                .stream()
+                .noneMatch(budget -> budget.getMonth().equals(month));
+        assertTrue(result);
     }
 
     @Then("I should be alerted that the budget does not exist")
@@ -72,4 +87,13 @@ public void iShouldBeAlertedThatTheBudgetDoesNotExist() {
                 .body("code", equalTo(404));
     }
 
+    @Then("I should be alerted that no budgets exist")
+    public void iShouldBeAlertedThatNoBudgetsExist() {
+        response.then()
+                .statusCode(404)
+                .body("timestamp", notNullValue())
+                .body("path", equalTo("/budgets/"))
+                .body("message", equalTo("Not Found"))
+                .body("code", equalTo(404));
+    }
 }

component-tests/src/test/java/com/dercio/database_proxy/budgets/steps/GetBudgetsSteps.java

@@ -57,7 +57,7 @@ public void aListOfBudgetsExists() {
 
     @When("I retrieve all the budgets")
     public void iRetrieveAllTheBudgets() {
-        response = budgetsService.getBudgets();
+        response = budgetsService.getAll();
     }
 
     @Then("I should see all the budgets")
@@ -73,7 +73,7 @@ public void iShouldSeeAllTheBudgets() {
 
     @When("I retrieve a budget with id {int}")
     public void iRetrieveABudgetWithId(int id) {
-        response = budgetsService.getBudgetById(id);
+        response = budgetsService.getById(id);
     }
 
     @Then("I should see the budget")
@@ -96,7 +96,7 @@ public void iShouldGetANotFoundErrorMessage() {
 
     @When("I retrieve a budget with an invalid id")
     public void iRetrieveABudgetWithAnInvalidId() {
-        response = budgetsService.getBudgetById("INVALID");
+        response = budgetsService.getById("INVALID");
     }
 
     @Then("I should get a validation error message")

component-tests/src/test/java/com/dercio/database_proxy/budgets/steps/UpdateBudgetsSteps.java

@@ -50,7 +50,7 @@ public void iUpdateTheMonthToNoValue() {
 
         budget.setMonth(null);
 
-        response = budgetsService.updateBudget(budget.getId(), budget);
+        response = budgetsService.update(budget.getId(), budget);
     }
 
     @Then("I should be alerted that the month is a required field")
@@ -69,7 +69,7 @@ public void iUpdateTheUserIdField() {
 
         budget.setUserId("something-else");
 
-        response = budgetsService.updateBudget(budget.getId(), budget);
+        response = budgetsService.update(budget.getId(), budget);
     }
 
     @Then("I should see the new user id in the budget")
@@ -89,7 +89,7 @@ public void iUpdateTheYearField() {
 
         budget.setYear(1999);
 
-        response = budgetsService.updateBudget(budget.getId(), budget);
+        response = budgetsService.update(budget.getId(), budget);
     }
 
     @Then("I should see the new year in the budget")
@@ -107,7 +107,7 @@ public void iShouldSeeTheNewYearInTheBudget() {
     public void iUpdateABudgetThatDoesNotExist() {
         var januaryBudget = createJanuaryBudget();
 
-        response = budgetsService.updateBudget(januaryBudget.getId(), januaryBudget);
+        response = budgetsService.update(januaryBudget.getId(), januaryBudget);
     }
 
     @Then("I should notified the budget does not exist")

component-tests/src/test/java/com/dercio/database_proxy/common/RestService.java

@@ -1,6 +1,7 @@
 package com.dercio.database_proxy.common;
 
 import com.dercio.database_proxy.common.mapper.Mapper;
+import io.cucumber.java.it.Ma;
 import io.restassured.http.ContentType;
 import io.restassured.response.Response;
 
@@ -72,6 +73,16 @@ public Response getById(Object firstValue, Object secondValue) {
                 .prettyPeek();
     }
 
+    public Response delete(Map<String, Object> filters) {
+        return given()
+                .baseUri(baseUri)
+                .log()
+                .all(true)
+                .queryParams(filters)
+                .delete(path)
+                .prettyPeek();
+    }
+
     public Response deleteById(int id) {
         return given()
                 .baseUri(baseUri)
@@ -101,7 +112,7 @@ public Response deleteById(Object firstValue, Object secondValue) {
                 .prettyPeek();
     }
 
-    public Response update(int id, Object resorce) {
+    public Response update(long id, Object resorce) {
         return given()
                 .baseUri(baseUri)
                 .contentType(ContentType.JSON)

component-tests/src/test/java/com/dercio/database_proxy/students/StudentRepository.java

@@ -2,9 +2,13 @@
 
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface StudentRepository {
     Student findById(@Param("name") String name, @Param("age") int age);
 
+    List<Student> find();
+
     void save(Student student);
 
     void deleteByNameAndAge(@Param("name") String name, @Param("age") int age);

component-tests/src/test/java/com/dercio/database_proxy/students/steps/DeleteStudentSteps.java

@@ -7,6 +7,11 @@
 import io.cucumber.java.en.When;
 import lombok.RequiredArgsConstructor;
 
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 @RequiredArgsConstructor(onConstructor_ = @Inject)
 public class DeleteStudentSteps {
     private final StudentContext studentContext;
@@ -24,11 +29,23 @@ public void iDeleteAStudentNamedAndAge() {
         studentContext.setResponse(studentService.deleteById(student.name(), student.age()));
     }
 
+    @When("I delete all students")
+    public void iDeleteAllStudents() {
+        studentContext.setResponse(studentService.delete(Map.of()));
+    }
+
     @Then("the student should be deleted")
     public void theStudentShouldBeDeleted() {
         var student = studentContext.getStudents().get(0);
         var response = studentContext.getResponse();
         response.then().statusCode(204);
-        studentRepository.findById(student.name(), student.age());
+        assertNull(studentRepository.findById(student.name(), student.age()));
+    }
+
+    @Then("all students should be deleted")
+    public void allStudentShouldBeDeleted() {
+        var response = studentContext.getResponse();
+        response.then().statusCode(204);
+        assertEquals(0, studentRepository.find().size());
     }
 }

component-tests/src/test/resources/batis/cockroach/repositories/StudentRepository.xml

@@ -3,6 +3,10 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dercio.database_proxy.students.StudentRepository">
+    <select id="find" resultType="com.dercio.database_proxy.students.Student">
+        SELECT *
+        FROM public.students
+    </select>
     <select id="findById" resultType="com.dercio.database_proxy.students.Student">
         SELECT *
         FROM public.students

component-tests/src/test/resources/batis/postgres/repositories/BudgetsRepository.xml

@@ -8,6 +8,10 @@
         FROM money.budgets
         WHERE id = #{id}
     </select>
+    <select id="find" resultType="com.dercio.database_proxy.budgets.Budget">
+        SELECT *
+        FROM money.budgets
+    </select>
     <insert id="save"
             parameterType="com.dercio.database_proxy.budgets.Budget">
         INSERT INTO money.budgets(id,