Refactors to JPQL instead of Query Methods.

Author: brunodrugowick

src/main/java/dev/drugowick/jpaqueriesblogpost/domain/model/Restaurant.java

@@ -31,7 +31,7 @@ public class Restaurant {
 
     private String address;
     private String city;
-    private boolean grabAndGo;
+    private boolean grabngo;
     private boolean active;
 
     @CreationTimestamp

src/main/java/dev/drugowick/jpaqueriesblogpost/infrastructure/repository/RestaurantRepository.java

@@ -2,6 +2,7 @@
 
 import dev.drugowick.jpaqueriesblogpost.domain.model.Restaurant;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -17,4 +18,7 @@ public interface RestaurantRepository extends JpaRepository<Restaurant, Long> {
     long countByCuisineName(String cuisine);
 
     Restaurant findTopByCuisineNameOrderByDeliveryFeeAsc(String cuisine);
+
+    @Query("from Restaurant r where r.active = true and r.grabngo = true and r.city like %:city%")
+    List<Restaurant> activeGrabngoByCity(String city);
 }

src/main/java/dev/drugowick/jpaqueriesblogpost/web/pages/IndexPage.java

@@ -40,6 +40,8 @@ public String indexWithQuery(@RequestParam("query") String query,
                 query = "100.00";
             }
             model.addAttribute("restaurants", restaurantRepository.findAllByDeliveryFeeIsLessThanEqual(deliveryFee));
+        } else if (field.equals("local-grabngo")) {
+            model.addAttribute("restaurants", restaurantRepository.activeGrabngoByCity(query));
         }
         model.addAttribute("field", field);
         model.addAttribute("query", query);

src/main/resources/import.sql

@@ -3,10 +3,10 @@ insert into cuisine (name) values ('Brazilian');
 insert into cuisine (name) values ('American');
 insert into cuisine (name) values ('French');
 
-insert into restaurant (name, address, delivery_fee, cuisine_id, created_date, updated_date, city, grab_and_go, active) values ('Mamma Mia', 'Mamma Street, 14', 10.0, 1, current_timestamp, current_timestamp, 'Venice', false, true);
-insert into restaurant (name, address, delivery_fee, cuisine_id, created_date, updated_date, city, grab_and_go, active) values ('Churrascaria', 'Disorder Avenue, 5000', 8.0, 2, current_timestamp, current_timestamp, 'Sertãozinho', true, true);
-insert into restaurant (name, address, delivery_fee, cuisine_id, created_date, updated_date, city, grab_and_go, active) values ('Burguer Place', 'Clueless Alley, 10', 5.0, 3, current_timestamp, current_timestamp, 'San Francisco', true, false);
-insert into restaurant (name, address, delivery_fee, cuisine_id, created_date, updated_date, city, grab_and_go, active) values ('La Maison du Croissant ', 'Rue Paris, 7', 15.0, 4, current_timestamp, current_timestamp, 'Paris', false, true);
+insert into restaurant (name, address, delivery_fee, cuisine_id, created_date, updated_date, city, grabngo, active) values ('Mamma Mia', 'Mamma Street, 14', 10.0, 1, current_timestamp, current_timestamp, 'Venice', false, true);
+insert into restaurant (name, address, delivery_fee, cuisine_id, created_date, updated_date, city, grabngo, active) values ('Churrascaria', 'Disorder Avenue, 5000', 8.0, 2, current_timestamp, current_timestamp, 'Sertãozinho', true, true);
+insert into restaurant (name, address, delivery_fee, cuisine_id, created_date, updated_date, city, grabngo, active) values ('Burguer Place', 'Clueless Alley, 10', 5.0, 3, current_timestamp, current_timestamp, 'San Francisco', true, false);
+insert into restaurant (name, address, delivery_fee, cuisine_id, created_date, updated_date, city, grabngo, active) values ('La Maison du Croissant ', 'Rue Paris, 7', 15.0, 4, current_timestamp, current_timestamp, 'Paris', false, true);
 
-insert into restaurant (name, address, delivery_fee, cuisine_id, created_date, updated_date, city, grab_and_go, active) values ('Pasta Buona', 'Pasta Street, 4', 2.0, 1, current_timestamp, current_timestamp, 'Roma', true, true);
-insert into restaurant (name, address, delivery_fee, cuisine_id, created_date, updated_date, city, grab_and_go, active) values ('Marcante Pizzaria', 'Bricks Street, 21', 9.0, 2, current_timestamp, current_timestamp, 'São Paulo', true, false);
+insert into restaurant (name, address, delivery_fee, cuisine_id, created_date, updated_date, city, grabngo, active) values ('Pasta Buona', 'Pasta Street, 4', 2.0, 1, current_timestamp, current_timestamp, 'Roma', true, true);
+insert into restaurant (name, address, delivery_fee, cuisine_id, created_date, updated_date, city, grabngo, active) values ('Marcante Pizzaria', 'Bricks Street, 21', 9.0, 2, current_timestamp, current_timestamp, 'São Paulo', true, false);

src/main/resources/templates/index.html

@@ -23,6 +23,7 @@ <h4>Filter Restaurants</h4>
                     <option th:selected="${field == 'name'}" value="name">Name</option>
                     <option th:selected="${field == 'cuisine'}" value="cuisine">Cuisine</option>
                     <option th:selected="${field == 'delivery-fee'}" value="delivery-fee">Delivery Fee</option>
+                    <option th:selected="${field == 'local-grabngo'}" value="local-grabngo">Active and Grab'n'Go by City</option>
                 </select>
             </div>
             <div class="form-group row">
@@ -61,7 +62,7 @@ <h4>Filter Restaurants</h4>
         <td th:text="${restaurant.getDeliveryFee()}"></td>
         <td th:text="${restaurant.getCuisine().getName()}"></td>
         <td th:text="${restaurant.getCity()}"></td>
-        <td><input type="checkbox" th:checked="${restaurant.isGrabAndGo()}" disabled="true"></td>
+        <td><input type="checkbox" th:checked="${restaurant.isGrabngo()}" disabled="true"></td>
         <td><input type="checkbox" th:checked="${restaurant.isActive()}" disabled="true"></td>
     </tr>
     <tbody>

src/main/resources/templates/restaurant.html

@@ -45,8 +45,8 @@ <h1 th:text="${restaurant.getName()}">Restaurant 1</h1>
     </tr>
     <tr>
         <td>Grab'n'Go</td>
-        <td th:if="${restaurant.isGrabAndGo()}">Yes</td>
-        <td th:if="${!restaurant.isGrabAndGo()}">No</td>
+        <td th:if="${restaurant.isGrabngo()}">Yes</td>
+        <td th:if="${!restaurant.isGrabngo()}">No</td>
     </tr>
     <tr>
         <td>Active</td>