admin: Tax Zones

Author: phasenraum2010

src/main/java/org/woehlke/greenshop/admin/AdminLocationTaxesController.java

@@ -19,6 +19,7 @@
 import javax.validation.Valid;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by tw on 04.01.15.
@@ -246,6 +247,10 @@ public String taxZoneInsertForm(@PathVariable long taxZoneId, Model model){
             thisZone = zones.iterator().next();
         }
         model.addAttribute("thisZone",thisZone);
+        Map<Long,List<Zone>> zoneMap = adminService.getZoneMap();
+        model.addAttribute("zoneMap",zoneMap);
+        List<Country> countries = customerService.findAllCountriesOrderByName();
+        model.addAttribute("countries",countries);
         return "admin/taxZoneInsertForm";
     }
 
@@ -315,6 +320,10 @@ public String taxZoneWithZoneIdEditForm(@PathVariable long taxZoneId, @PathVaria
         model.addAttribute("zones",zones);
         TaxZone2Zone thisZone = adminService.findTaxZone2ZoneById(zoneId);
         model.addAttribute("thisZone",thisZone);
+        Map<Long,List<Zone>> zoneMap = adminService.getZoneMap();
+        model.addAttribute("zoneMap",zoneMap);
+        List<Country> countries = customerService.findAllCountriesOrderByName();
+        model.addAttribute("countries",countries);
         return "admin/taxZoneEditForm";
     }
 

src/main/java/org/woehlke/greenshop/admin/AdminService.java

@@ -11,9 +11,11 @@
 import org.woehlke.greenshop.checkout.entities.OrderStatus;
 import org.woehlke.greenshop.checkout.entities.OrderStatusId;
 import org.woehlke.greenshop.customer.entities.Customer;
+import org.woehlke.greenshop.customer.entities.Zone;
 import org.woehlke.greenshop.customer.model.CustomerBean;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by tw on 31.12.14.
@@ -89,4 +91,7 @@ public interface AdminService extends UserDetailsService {
     void deleteTaxZone2Zone(TaxZone2Zone thisZone);
 
     void updateTaxZone2Zone(TaxZone2Zone thisZone);
+
+    Map<Long, List<Zone>> getZoneMap();
+
 }

src/main/java/org/woehlke/greenshop/admin/AdminServiceImpl.java

@@ -21,16 +21,15 @@
 import org.woehlke.greenshop.checkout.repository.OrderTotalRepository;
 import org.woehlke.greenshop.customer.entities.Customer;
 import org.woehlke.greenshop.customer.entities.CustomerInfo;
+import org.woehlke.greenshop.customer.entities.Zone;
 import org.woehlke.greenshop.customer.model.CustomerBean;
 import org.woehlke.greenshop.customer.repository.CustomerInfoRepository;
 import org.woehlke.greenshop.customer.repository.CustomerRepository;
 import org.woehlke.greenshop.customer.repository.ZoneRepository;
 
 import javax.inject.Inject;
 import javax.inject.Named;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * Created by tw on 31.12.14.
@@ -368,4 +367,23 @@ public void deleteTaxZone2Zone(TaxZone2Zone thisZone) {
     public void updateTaxZone2Zone(TaxZone2Zone thisZone) {
         taxZone2ZoneRepository.save(thisZone);
     }
+
+    @Override
+    public Map<Long, List<Zone>> getZoneMap() {
+        List<Zone> zones = zoneRepository.findAll();
+        Map<Long, List<Zone>> zoneMap = new LinkedHashMap<>();
+        List<Zone> subZoneList = new ArrayList<>();
+        long countryId = 0;
+        for(Zone zone: zones){
+            if(countryId != zone.getCountry().getId()){
+                if(subZoneList.size()>0){
+                    zoneMap.put(countryId,subZoneList);
+                    subZoneList = new ArrayList<>();
+                }
+                countryId = zone.getCountry().getId();
+            }
+            subZoneList.add(zone);
+        }
+        return zoneMap;
+    }
 }

src/main/webapp/WEB-INF/jsp/admin/taxZoneEditForm.jsp

@@ -0,0 +1,44 @@
+package org.woehlke.greenshop.admin;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.woehlke.greenshop.customer.entities.Zone;
+
+import javax.inject.Inject;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by tw on 29.01.15.
+ */
+@WebAppConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:/servlet-context.xml")
+public class AdminServiceImplTest {
+
+    private static final Logger logger = LoggerFactory.getLogger(AdminServiceImplTest.class);
+
+    @Inject
+    private AdminService adminService;
+
+    @Test
+    public void getZoneMapTest() throws Exception {
+        logger.info("------------------------------------------------------");
+        Map<Long, List<Zone>> zoneMap = adminService.getZoneMap();
+        logger.info("------------------------------------------------------");
+        for(Long countryId:zoneMap.keySet()){
+            logger.info("## CountryId: "+countryId+" ##");
+            for(Zone zone: zoneMap.get(countryId)){
+                logger.info("#### Zone: "+zone.toString());
+                Assert.assertEquals(countryId,zone.getCountry().getId());
+            }
+        }
+        logger.info("------------------------------------------------------");
+    }
+}