Added reasonable parameters to PaymentService.

Author: dnobel

com.github.groovyosgi.testing.paymentservice/src/main/java/com/github/groovyosgi/testing/paymentservice/CreditCardPaymentService.java

@@ -2,6 +2,6 @@
 
 public interface CreditCardPaymentService {
 
-    void handleTransaction();
+    void handleTransaction(String companyId, long creditCardNumber, String cardHolderName, float price);
 
 }

com.github.groovyosgi.testing.pizzaservice.impl/src/main/java/com/github/groovyosgi/testing/pizzaservice/impl/PizzaServiceImpl.java

@@ -9,27 +9,70 @@
 import com.github.groovyosgi.testing.paymentservice.CreditCardPaymentService;
 import com.github.groovyosgi.testing.pizzaservice.PizzaBaker;
 import com.github.groovyosgi.testing.pizzaservice.PizzaService;
+import com.github.groovyosgi.testing.pizzaservice.model.CustomerInfo;
 import com.github.groovyosgi.testing.pizzaservice.model.Order;
 import com.github.groovyosgi.testing.pizzaservice.model.Pizza;
 
 public class PizzaServiceImpl implements PizzaService {
 
+    private static final String PAYMENT_SERVICE_COMPANY_ID = "LUIGIS_PIZZA_SERVICE";
     private static final String TAG = PizzaServiceImpl.class.getName();
     private CreditCardPaymentService creditCardPaymentService;
     private EventAdmin eventAdmin;
+    private int orderNumber = 0;
     private PizzaBaker pizzaBaker;
 
     @Override
     public void placeOrder(final Order order) {
-        creditCardPaymentService.handleTransaction();
-        Pizza pizza = pizzaBaker.bake(order.getPizza());
+
+        CustomerInfo customerInfo = order.getCustomerInfo();
+        Pizza orderedPizza = order.getPizza();
+
+        float price = calculatePrice(orderedPizza);
+
+        creditCardPaymentService.handleTransaction(PAYMENT_SERVICE_COMPANY_ID, customerInfo.getCreditCardNumber(),
+                customerInfo.getName(), price);
+
+        Pizza pizza = pizzaBaker.bake(orderedPizza);
+
         sendDeliveryEvent(order, pizza);
     }
 
+    private float calculatePrice(Pizza orderedPizza) {
+
+        float price = 3;
+
+        if (orderedPizza.isBacon()) {
+            price += 1;
+        }
+        if (orderedPizza.isCheese()) {
+            price += 0.5;
+        }
+
+        switch (orderedPizza.getSauce()) {
+            case BBQ:
+                price += 2;
+                break;
+            case HOLLANDAISE:
+                price += 1.5;
+                break;
+            case TOMATO:
+                price += 1;
+                break;
+            default:
+                break;
+        }
+
+        return price;
+    }
+
     private void sendDeliveryEvent(final Order order, Pizza pizza) {
+
         HashMap<String, Object> properties = new HashMap<>();
+        properties.put(EVENT_PROPERTY_ID, orderNumber++);
         properties.put(EVENT_PROPERTY_PIZZA, pizza);
         properties.put(EVENT_PROPERTY_CUSTOMER_INFO, order.getCustomerInfo());
+
         eventAdmin.postEvent(new Event(EVENT_TOPIC_PIZZA_DELIVERY, properties));
     }
 
@@ -41,10 +84,10 @@ void deactivate(final ComponentContext componentContext) {
         System.out.println(TAG + " stoped!");
     }
 
-    void setCreditCardPaymentService(
-            final CreditCardPaymentService creditCardPaymentService) {
+    void setCreditCardPaymentService(final CreditCardPaymentService creditCardPaymentService) {
         this.creditCardPaymentService = creditCardPaymentService;
     }
+
     void setEventAdmin(EventAdmin eventAdmin) {
         this.eventAdmin = eventAdmin;
     }
@@ -53,8 +96,7 @@ void setPizzaBaker(PizzaBaker pizzaBaker) {
         this.pizzaBaker = pizzaBaker;
     }
 
-    void unsetCreditCardPaymentService(
-            final CreditCardPaymentService creditCardPaymentService) {
+    void unsetCreditCardPaymentService(final CreditCardPaymentService creditCardPaymentService) {
         this.creditCardPaymentService = null;
     }
 

com.github.groovyosgi.testing.pizzaservice.test/src/main/groovy/com/github/groovyosgi/testing/pizzaservice/test/PizzaServiceTest.groovy

@@ -20,13 +20,16 @@ import com.github.groovyosgi.testing.pizzaservice.model.Pizza.Sauce
 class PizzaServiceTest extends OSGiTest{
 
     @Test
-    public void test() {
+    public void assertHandleTransactionIsCalled() {
 
         def transactionCalled = false
 
         def paymentService = [
-            handleTransaction: {
-                println "handleTransaction called"
+            handleTransaction: { String companyId, long creditCardNumber, String cardHolderName, float price ->
+                assertThat companyId, is(equalTo('LUIGIS_PIZZA_SERVICE'))
+                assertThat creditCardNumber, is(524030324560)
+                assertThat cardHolderName, is(equalTo("Max Mustermann"))
+                assertThat price, is(5f)
                 transactionCalled = true
             }
         ] as CreditCardPaymentService
@@ -35,7 +38,7 @@ class PizzaServiceTest extends OSGiTest{
 
         PizzaService pizzaService = getService(PizzaService)
         def pizza = PizzaBuilder.newPizza().withSauce(Sauce.BBQ).build()
-        def customerInfo = new CustomerInfo("Max Mustermann", new Address(), 524030324560 as short)
+        def customerInfo = new CustomerInfo("Max Mustermann", new Address(), 524030324560)
         pizzaService.placeOrder(new Order(pizza, customerInfo))
 
         assertThat transactionCalled, is(true)

com.github.groovyosgi.testing.pizzaservice/src/main/java/com/github/groovyosgi/testing/pizzaservice/model/CustomerInfo.java

@@ -3,10 +3,10 @@
 public class CustomerInfo {
 
     private final Address address;
-    private final short creditCardNumber;
+    private final long creditCardNumber;
     private final String name;
 
-    public CustomerInfo(String name, Address address, short creditCardNumber) {
+    public CustomerInfo(String name, Address address, long creditCardNumber) {
         this.name = name;
         this.address = address;
         this.creditCardNumber = creditCardNumber;
@@ -16,7 +16,7 @@ public Address getAddress() {
         return address;
     }
 
-    public short getCreditCardNumber() {
+    public long getCreditCardNumber() {
         return creditCardNumber;
     }