Skip to content

Commit 100867b

Browse files
phasenraum2010phasenraum2010
committed
Service and Controller Refactoring
1 parent fbc886a commit 100867b

39 files changed

+753
-505
lines changed

‎src/main/java/org/woehlke/greenshop/AbstractController.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.woehlke.greenshop.catalog.model.Manufacturers;
2222
import org.woehlke.greenshop.catalog.model.ShareProductBean;
2323
import org.woehlke.greenshop.catalog.model.SpecialProduct;
24+
import org.woehlke.greenshop.catalog.service.LanguageService;
2425
import org.woehlke.greenshop.customer.CustomerService;
2526
import org.woehlke.greenshop.customer.entities.Customer;
2627

@@ -31,14 +32,17 @@ public abstract class AbstractController {
3132

3233
@Inject
3334
protected CustomerService customerService;
35+
36+
@Inject
37+
protected LanguageService languageService;
3438

3539
@ModelAttribute("transientBasket")
3640
public TransientBasket createTransientBasket(){
3741
return new TransientBasket();
3842
}
3943

4044
protected void getDefaultBoxContent(Model model){
41-
Language language = catalogService.findLanguageByCode("en");
45+
Language language = languageService.findLanguageByCode("en");
4246
List<SpecialProduct> newProducts = catalogService.recommenderNewProducts(language);
4347
model.addAttribute("newProducts", newProducts);
4448
Manufacturers manufacturers=catalogService.findManufacturers();

‎src/main/java/org/woehlke/greenshop/CartController.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.woehlke.greenshop.catalog.model.Manufacturers;
2626
import org.woehlke.greenshop.catalog.model.ProductAttributes;
2727
import org.woehlke.greenshop.catalog.model.SpecialProduct;
28+
import org.woehlke.greenshop.catalog.service.LanguageService;
2829

2930
@Controller
3031
@SessionAttributes({"transientBasket"})
@@ -34,6 +35,9 @@ public class CartController extends AbstractController {
3435

3536
@Inject
3637
private CartService cartService;
38+
39+
@Inject
40+
private LanguageService languageService;
3741

3842
@RequestMapping(value = "/shoppingCart", method = RequestMethod.GET)
3943
public String shoppingCart(
@@ -50,7 +54,7 @@ public String addToBasket(
5054
HttpServletRequest request,
5155
HttpServletResponse response,
5256
@PathVariable long productId, Model model){
53-
Language language = catalogService.findLanguageByCode("en");
57+
Language language = languageService.findLanguageByCode("en");
5458
ReviewDescription randomReview = catalogService.getRandomReview(language);
5559
model.addAttribute("randomReview", randomReview);
5660
SpecialProduct randomSpecialProduct = catalogService.getRandomSpecial(language);
@@ -77,7 +81,7 @@ public String removeFromBasket(
7781
HttpServletRequest request,
7882
HttpServletResponse response,
7983
@PathVariable long productId, Model model){
80-
Language language = catalogService.findLanguageByCode("en");
84+
Language language = languageService.findLanguageByCode("en");
8185
ReviewDescription randomReview = catalogService.getRandomReview(language);
8286
model.addAttribute("randomReview", randomReview);
8387
SpecialProduct randomSpecialProduct = catalogService.getRandomSpecial(language);

‎src/main/java/org/woehlke/greenshop/CatalogController.java‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
import org.springframework.web.bind.annotation.*;
1313
import org.woehlke.greenshop.catalog.entities.*;
1414
import org.woehlke.greenshop.catalog.model.*;
15+
import org.woehlke.greenshop.catalog.service.LanguageService;
1516
import org.woehlke.greenshop.customer.entities.Customer;
1617

18+
import javax.inject.Inject;
1719
import javax.servlet.http.HttpServletRequest;
1820
import javax.servlet.http.HttpServletResponse;
1921
import javax.validation.Valid;
@@ -24,7 +26,7 @@
2426
public class CatalogController extends AbstractController {
2527

2628
private static final Logger logger = LoggerFactory.getLogger(CatalogController.class);
27-
29+
2830
@RequestMapping(value = "/", method = RequestMethod.GET)
2931
public String home(Model model){
3032
super.getDefaultBoxContent(model);
@@ -33,7 +35,7 @@ public String home(Model model){
3335

3436
@RequestMapping(value = "/category/{categoryId}", method = RequestMethod.GET)
3537
public String category(@PathVariable long categoryId,Model model){
36-
Language language = catalogService.findLanguageByCode("en");
38+
Language language = languageService.findLanguageByCode("en");
3739
ReviewDescription randomReview = catalogService.getRandomReview(language);
3840
model.addAttribute("randomReview", randomReview);
3941
SpecialProduct randomSpecialProduct = catalogService.getRandomSpecial(language);
@@ -66,7 +68,7 @@ public String categoryFilteredByManufacturerId(
6668
public String categoryFilteredByManufacturer(
6769
@PathVariable long categoryId,
6870
@PathVariable long manufacturerId, Model model){
69-
Language language = catalogService.findLanguageByCode("en");
71+
Language language = languageService.findLanguageByCode("en");
7072
ReviewDescription randomReview = catalogService.getRandomReview(language);
7173
model.addAttribute("randomReview", randomReview);
7274
SpecialProduct randomSpecialProduct = catalogService.getRandomSpecial(language);
@@ -89,7 +91,7 @@ public String product(@PathVariable long productId,
8991
HttpServletRequest request,
9092
HttpServletResponse response,
9193
Model model){
92-
Language language = catalogService.findLanguageByCode("en");
94+
Language language = languageService.findLanguageByCode("en");
9395
ReviewDescription randomReview = catalogService.getRandomReview(language);
9496
model.addAttribute("randomReview", randomReview);
9597
SpecialProduct randomSpecialProduct = catalogService.getRandomSpecial(language);
@@ -125,7 +127,7 @@ public String manufacturer(@RequestParam("manufacturers_id") Long manufacturerId
125127
@RequestMapping(value = "/manufacturer/{manufacturerId}", method = RequestMethod.GET)
126128
public String manufacturer(@PathVariable long manufacturerId,Model model){
127129
logger.info("manufacturers_id="+manufacturerId);
128-
Language language = catalogService.findLanguageByCode("en");
130+
Language language = languageService.findLanguageByCode("en");
129131
ReviewDescription randomReview = catalogService.getRandomReview(language);
130132
model.addAttribute("randomReview", randomReview);
131133
SpecialProduct randomSpecialProduct = catalogService.getRandomSpecial(language);
@@ -162,7 +164,7 @@ public String manufacturerFilteredByCategory(
162164
@PathVariable long manufacturerId,
163165
@PathVariable long categoryId, Model model){
164166
logger.info("manufacturers_id="+manufacturerId);
165-
Language language = catalogService.findLanguageByCode("en");
167+
Language language = languageService.findLanguageByCode("en");
166168
ReviewDescription randomReview = catalogService.getRandomReview(language);
167169
model.addAttribute("randomReview", randomReview);
168170
SpecialProduct randomSpecialProduct = catalogService.getRandomSpecial(language);
@@ -187,7 +189,7 @@ public String manufacturerFilteredByCategory(
187189
@RequestMapping(value = "/manufacturer/redirect/{manufacturerId}", method = RequestMethod.GET)
188190
public String manufacturerRedirect(@PathVariable long manufacturerId,Model model) {
189191
logger.info("manufacturers_id=" + manufacturerId);
190-
Language language = catalogService.findLanguageByCode("en");
192+
Language language = languageService.findLanguageByCode("en");
191193
ReviewDescription randomReview = catalogService.getRandomReview(language);
192194
model.addAttribute("randomReview", randomReview);
193195
SpecialProduct randomSpecialProduct = catalogService.getRandomSpecial(language);
@@ -205,7 +207,7 @@ public String writeReviewForProduct(@PathVariable long productId,
205207
HttpServletRequest request,
206208
HttpServletResponse response,
207209
Model model){
208-
Language language = catalogService.findLanguageByCode("en");
210+
Language language = languageService.findLanguageByCode("en");
209211
ReviewDescription randomReview = catalogService.getRandomReview(language);
210212
model.addAttribute("randomReview", randomReview);
211213
SpecialProduct randomSpecialProduct = catalogService.getRandomSpecial(language);
@@ -239,7 +241,7 @@ public String writeReviewForProductPerform(@ModelAttribute("writeReviewBean") @V
239241
HttpServletRequest request,
240242
HttpServletResponse response,
241243
Model model){
242-
Language language = catalogService.findLanguageByCode("en");
244+
Language language = languageService.findLanguageByCode("en");
243245
ReviewDescription randomReview = catalogService.getRandomReview(language);
244246
model.addAttribute("randomReview", randomReview);
245247
SpecialProduct randomSpecialProduct = catalogService.getRandomSpecial(language);
@@ -279,7 +281,7 @@ public String showReviews(@PathVariable long productId,
279281
HttpServletRequest request,
280282
HttpServletResponse response,
281283
Model model){
282-
Language language = catalogService.findLanguageByCode("en");
284+
Language language = languageService.findLanguageByCode("en");
283285
ReviewDescription randomReview = catalogService.getRandomReview(language);
284286
model.addAttribute("randomReview", randomReview);
285287
SpecialProduct randomSpecialProduct = catalogService.getRandomSpecial(language);
@@ -314,7 +316,7 @@ public String showReview(@PathVariable long reviewId,
314316
HttpServletRequest request,
315317
HttpServletResponse response,
316318
Model model){
317-
Language language = catalogService.findLanguageByCode("en");
319+
Language language = languageService.findLanguageByCode("en");
318320
ReviewDescription randomReview = catalogService.getRandomReview(language);
319321
model.addAttribute("randomReview", randomReview);
320322
SpecialProduct randomSpecialProduct = catalogService.getRandomSpecial(language);
@@ -347,7 +349,7 @@ public String showReview(@PathVariable long reviewId,
347349
public String reviews(HttpServletRequest request,
348350
HttpServletResponse response,
349351
Model model) {
350-
Language language = catalogService.findLanguageByCode("en");
352+
Language language = languageService.findLanguageByCode("en");
351353
ReviewDescription randomReview = catalogService.getRandomReview(language);
352354
model.addAttribute("randomReview", randomReview);
353355
SpecialProduct randomSpecialProduct = catalogService.getRandomSpecial(language);
@@ -367,7 +369,7 @@ public String reviews(HttpServletRequest request,
367369
public String specials(HttpServletRequest request,
368370
HttpServletResponse response,
369371
Model model) {
370-
Language language = catalogService.findLanguageByCode("en");
372+
Language language = languageService.findLanguageByCode("en");
371373
ReviewDescription randomReview = catalogService.getRandomReview(language);
372374
model.addAttribute("randomReview", randomReview);
373375
SpecialProduct randomSpecialProduct = catalogService.getRandomSpecial(language);
@@ -387,7 +389,7 @@ public String specials(HttpServletRequest request,
387389
public String newProducts(HttpServletRequest request,
388390
HttpServletResponse response,
389391
Model model){
390-
Language language = catalogService.findLanguageByCode("en");
392+
Language language = languageService.findLanguageByCode("en");
391393
ReviewDescription randomReview = catalogService.getRandomReview(language);
392394
model.addAttribute("randomReview", randomReview);
393395
SpecialProduct randomSpecialProduct = catalogService.getRandomSpecial(language);

‎src/main/java/org/woehlke/greenshop/SearchController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class SearchController extends AbstractController {
2323

2424
@RequestMapping(value = "/advancedSearch", method = RequestMethod.GET)
2525
public String showAdvancedSearchForm(Model model){
26-
Language language = catalogService.findLanguageByCode("en");
26+
Language language = languageService.findLanguageByCode("en");
2727
super.getDefaultBoxContent(model);
2828
AdvancedSearchBean advancedSearchBean = new AdvancedSearchBean();
2929
model.addAttribute("advancedSearchBean", advancedSearchBean);
@@ -45,7 +45,7 @@ public String showAdvancedSearchFormPost(
4545
@RequestMapping(value = "/search", method = RequestMethod.GET)
4646
public String showAdvancedSearchForm(
4747
@RequestParam String keywords, Model model){
48-
Language language = catalogService.findLanguageByCode("en");
48+
Language language = languageService.findLanguageByCode("en");
4949
super.getDefaultBoxContent(model);
5050
logger.info(keywords);
5151
return "searchResult";

‎src/main/java/org/woehlke/greenshop/UserController.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,16 +259,18 @@ public String accountPasswordPerform(@Valid ChangePasswordBean changePasswordBea
259259
@RequestMapping(value = "/accountHistory", method = RequestMethod.GET)
260260
public String accountHistory(Model model){
261261
super.getDefaultBoxContent(model);
262+
Language language = languageService.findLanguageByCode("en");
262263
Customer customer = super.getLoggedInCustomer();
263-
List<OrderHistoryBean> orderHistory = this.orderService.getOrderHistoryForCustomer(customer);
264+
List<OrderHistoryBean> orderHistory = this.orderService.getOrderHistoryForCustomer(customer,language);
264265
model.addAttribute("orders", orderHistory);
265266
return "accountHistory";
266267
}
267268

268269
@RequestMapping(value = "/accountHistoryInfo/{orderId}", method = RequestMethod.GET)
269270
public String accountHistoryInfo(@PathVariable long orderId, Model model){
270271
super.getDefaultBoxContent(model);
271-
OrderHistoryDetailsBean orderHistoryDetailsBean = this.orderService.findOrderDetailsById(orderId);
272+
Language language = languageService.findLanguageByCode("en");
273+
OrderHistoryDetailsBean orderHistoryDetailsBean = this.orderService.findOrderDetailsById(orderId,language);
272274
model.addAttribute("orderHistoryDetailsBean",orderHistoryDetailsBean);
273275
return "accountHistoryInfo";
274276
}
@@ -302,7 +304,7 @@ public String accountNewsletterPerform(Customer customer, BindingResult result,
302304
@RequestMapping(value = "/accountNotifications", method = RequestMethod.GET)
303305
public String accountNotifications(Model model){
304306
super.getDefaultBoxContent(model);
305-
Language language = catalogService.findLanguageByCode("en");
307+
Language language = languageService.findLanguageByCode("en");
306308
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
307309
String customerEmail = auth.getName();
308310
Customer customer = customerService.findCustomerByEmail(customerEmail);
@@ -341,7 +343,7 @@ public String accountNotificationsPerform(
341343
@RequestMapping(value = "/account/addProductNotification/{productId}", method = RequestMethod.GET)
342344
public String addProductNotification(@PathVariable long productId, Model model) {
343345
super.getDefaultBoxContent(model);
344-
Language language = catalogService.findLanguageByCode("en");
346+
Language language = languageService.findLanguageByCode("en");
345347
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
346348
String customerEmail = auth.getName();
347349
Customer myCustomer = customerService.findCustomerByEmail(customerEmail);

0 commit comments

Comments
 (0)