From dfcd54b47c561dd6f9094de91fbfd5e3da836323 Mon Sep 17 00:00:00 2001
From: Parry-Howells <chloe.parry-howells@capgemini.com>
Date: Thu, 14 Nov 2019 15:35:33 +0000
Subject: [PATCH] Fixed Code

---
 .../demo/controllers/GreetingController.java  |  9 +++++++
 .../tdd/demo/models/TalkyNumber.java          | 24 +++++++++++++++++++
 .../tdd/demo/services/NumberService.java      |  2 +-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/capgemini/tdd/demo/models/TalkyNumber.java

diff --git a/src/main/java/com/capgemini/tdd/demo/controllers/GreetingController.java b/src/main/java/com/capgemini/tdd/demo/controllers/GreetingController.java
index 79c47d1..d87650f 100644
--- a/src/main/java/com/capgemini/tdd/demo/controllers/GreetingController.java
+++ b/src/main/java/com/capgemini/tdd/demo/controllers/GreetingController.java
@@ -4,6 +4,7 @@
 
 import com.capgemini.tdd.demo.models.Greeting;
 
+import com.capgemini.tdd.demo.models.TalkyNumber;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -19,4 +20,12 @@ public Greeting greeting(@RequestParam(value="name", defaultValue="World") Strin
         return new Greeting(counter.incrementAndGet(),
                 String.format(template, name));
     }
+
+
+    @RequestMapping("/talkynumbers")
+    public TalkyNumber talkynumbers(@RequestParam(value = "number", defaultValue = "1") String number) {
+        return new TalkyNumber(counter.incrementAndGet(),
+                Integer.parseInt(number));
+    }
 }
+
diff --git a/src/main/java/com/capgemini/tdd/demo/models/TalkyNumber.java b/src/main/java/com/capgemini/tdd/demo/models/TalkyNumber.java
new file mode 100644
index 0000000..d7b2a2f
--- /dev/null
+++ b/src/main/java/com/capgemini/tdd/demo/models/TalkyNumber.java
@@ -0,0 +1,24 @@
+package com.capgemini.tdd.demo.models;
+
+import com.capgemini.tdd.demo.services.NumberService;
+
+public class TalkyNumber {
+    private final long id;
+    private final int number;
+    private NumberService talkynumbers = new NumberService();
+
+    public TalkyNumber(long id, int number) {
+        this.id = id;
+        this.number= number;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getNumber() {
+        return talkynumbers.convert(number);
+    }
+}
+
+
diff --git a/src/main/java/com/capgemini/tdd/demo/services/NumberService.java b/src/main/java/com/capgemini/tdd/demo/services/NumberService.java
index b9f572d..efaa7e6 100644
--- a/src/main/java/com/capgemini/tdd/demo/services/NumberService.java
+++ b/src/main/java/com/capgemini/tdd/demo/services/NumberService.java
@@ -68,7 +68,7 @@ public String convert(int num){
                 if(num >= 100){
                     output += ", ";
                 }
-                else{
+                else if (num > 0) {
                     output += " and ";
                 }