Skip to content

Commit cd1a3bb

Browse files
committed
Polish
1 parent 3793ba7 commit cd1a3bb

File tree

2 files changed

+85
-85
lines changed

2 files changed

+85
-85
lines changed

demo-sql2o/src/main/java/com/example/PizzaRepository.java

Lines changed: 85 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.sql2o.Query;
1010
import org.sql2o.Sql2o;
1111

12+
import java.math.BigDecimal;
1213
import java.util.List;
1314
import java.util.stream.Collectors;
1415

@@ -23,13 +24,13 @@ public PizzaRepository(Sql2o sql2o) {
2324
public List<Pizza> findOrderByIdAsc() {
2425
try (Connection con = sql2o.open()) {
2526
return con.createQuery("SELECT p.id, p.name, p.price, b.id AS baseId, b.name AS baseName, t.id AS toppingId, t.name AS toppingName FROM pizza p INNER JOIN base b ON (b.id = p.base_id) INNER JOIN pizza_toppings pt ON (pt.pizza_id = p.id) INNER JOIN topping t ON (t.id = pt.toppings_id) ORDER BY p.id ASC")
26-
.executeAndFetch(com.example.sql2o.Pizza.class)
27+
.executeAndFetch(PizzaDto.class)
2728
.stream()
28-
.collect(Collectors.groupingBy(com.example.sql2o.Pizza::getId))
29+
.collect(Collectors.groupingBy(PizzaDto::getId))
2930
.entrySet()
3031
.stream()
3132
.map(e -> {
32-
com.example.sql2o.Pizza dto = e.getValue().get(0);
33+
PizzaDto dto = e.getValue().get(0);
3334
Pizza pizza = new Pizza();
3435
pizza.setId(dto.getId());
3536
pizza.setName(dto.getName());
@@ -70,4 +71,85 @@ public Pizza save(Pizza pizza) {
7071
}
7172
return pizza;
7273
}
74+
75+
private static class PizzaDto {
76+
private Long id;
77+
private String name;
78+
private BigDecimal price;
79+
private Long baseId;
80+
private String baseName;
81+
private Long toppingId;
82+
private String toppingName;
83+
84+
public Long getId() {
85+
return id;
86+
}
87+
88+
public void setId(Long id) {
89+
this.id = id;
90+
}
91+
92+
public String getName() {
93+
return name;
94+
}
95+
96+
public void setName(String name) {
97+
this.name = name;
98+
}
99+
100+
public BigDecimal getPrice() {
101+
return price;
102+
}
103+
104+
public void setPrice(BigDecimal price) {
105+
this.price = price;
106+
}
107+
108+
public Long getBaseId() {
109+
return baseId;
110+
}
111+
112+
public void setBaseId(Long baseId) {
113+
this.baseId = baseId;
114+
}
115+
116+
public String getBaseName() {
117+
return baseName;
118+
}
119+
120+
public void setBaseName(String baseName) {
121+
this.baseName = baseName;
122+
}
123+
124+
public Long getToppingId() {
125+
return toppingId;
126+
}
127+
128+
public void setToppingId(Long toppingId) {
129+
this.toppingId = toppingId;
130+
}
131+
132+
public String getToppingName() {
133+
return toppingName;
134+
}
135+
136+
public void setToppingName(String toppingName) {
137+
this.toppingName = toppingName;
138+
}
139+
140+
@Override
141+
public String toString() {
142+
return "PizzaDto{" +
143+
"id=" + id +
144+
", name='" + name + '\'' +
145+
", price=" + price +
146+
", baseId=" + baseId +
147+
", baseName='" + baseName + '\'' +
148+
", toppingId=" + toppingId +
149+
", toppingName='" + toppingName + '\'' +
150+
'}';
151+
}
152+
}
73153
}
154+
155+

demo-sql2o/src/main/java/com/example/sql2o/Pizza.java

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)