[jboss-cvs] JBossAS SVN: r100054 - projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc.

[jboss-cvs-commits at lists.jboss.org]

Author: lvlcek at redhat.com
Date: 2010-01-28 10:48:20 -0500 (Thu, 28 Jan 2010)
New Revision: 100054

Modified:
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/AccountController.java
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/BasicController.java
Log:
Spring MVC (work in progress) - generate invoice

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/AccountController.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/AccountController.java	2010-01-28 15:31:16 UTC (rev 100053)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/AccountController.java	2010-01-28 15:48:20 UTC (rev 100054)
@@ -5,11 +5,17 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.ui.ModelMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jms.core.JmsTemplate;
 import org.jboss.snowdrop.samples.sportsclub.ejb.SubscriptionService;
 import org.jboss.snowdrop.samples.sportsclub.domain.entity.Account;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.Invoice;
+import org.jboss.snowdrop.samples.sportsclub.domain.entity.PaymentNotification;
+import org.jboss.spring.samples.sportsclub.invoicing.services.BillingService;
 
 import javax.ejb.EJB;
 import java.util.List;
+import java.math.BigDecimal;
 
 /**
  * @author <a href="mailto:lvlcek at redhat.com">Lukas Vlcek</a>
@@ -24,9 +30,14 @@
       invoiceStatus = new String[]{UserInput.INVOICE_WITHOUT, UserInput.INVOICE_WITH};
    }
 
+   @EJB(mappedName = "sportsclub/BillingService")
+   BillingService billingService;
+
    @EJB(mappedName = "sportsclub/SubscriptionService")
    SubscriptionService subscriptionService;
 
+   @Autowired
+   private JmsTemplate jmsTemplate;
 
    /**
     * Just forwarding to the view with fresh-empty model.
@@ -50,8 +61,6 @@
       Integer maxAccountNum = userInput.getMaxAccountNum();
       boolean currentInvoice = (UserInput.INVOICE_WITH.equals(userInput.getInvoiceStatus()) ? true : false);
 
-      System.out.println("****** currentInvoice = " + currentInvoice);
-
       List<Account> accountList = subscriptionService.findAccountsBySubscriberName(nameFragment, 0, maxAccountNum, currentInvoice);
 
       ModelMap model = new ModelMap();
@@ -74,6 +83,15 @@
    @RequestMapping(value = "/generateInvoice.do", method = RequestMethod.POST)
    ModelMap generateInvoice(@RequestParam("id") String id)
    {
+
+      // doublecheck that account does not have current invoice
+      Account account = subscriptionService.findAccountById(Long.parseLong(id));
+      Invoice invoice = billingService.generateInvoice(account);
+      PaymentNotification paymentNotification = new PaymentNotification();
+      paymentNotification.setAccountNumber(account.getId());
+      paymentNotification.setAmount(BigDecimal.valueOf(50l));
+      jmsTemplate.convertAndSend(paymentNotification);
+
       ModelMap model = new ModelMap();
       model.addAttribute("id",id);
       return model;

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/BasicController.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/BasicController.java	2010-01-28 15:31:16 UTC (rev 100053)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/BasicController.java	2010-01-28 15:48:20 UTC (rev 100054)
@@ -17,6 +17,7 @@
 import org.springframework.web.servlet.ModelAndView;
 
 @Controller
+ at Deprecated
 public class BasicController
 {
    @EJB(mappedName = "sportsclub/BillingService")