From b7fad65fe3ab2ac30dd2719fabfbc487220c18a0 Mon Sep 17 00:00:00 2001
From: David Sampimon <davidsampimon@gmail.com>
Date: Fri, 24 Jan 2020 21:07:58 +0100
Subject: [PATCH 1/2] Addresses issue #6 by changing the number of examples to
 3

---
 .idea/codeStyles/codeStyleConfig.xml             |  5 +++++
 .idea/misc.xml                                   | 16 ++--------------
 .idea/modules.xml                                | 10 ----------
 .../flashy/controllers/IndexController.java      |  3 ++-
 4 files changed, 9 insertions(+), 25 deletions(-)
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 delete mode 100644 .idea/modules.xml

diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..b9d18bf
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="GoogleStyle" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 164b970..6bd5763 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,19 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 0b6b7df..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/flashy.iml" filepath="$PROJECT_DIR$/.idea/modules/flashy.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/flashy_main.iml" filepath="$PROJECT_DIR$/.idea/modules/flashy_main.iml" group="flashy" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/flashy_test.iml" filepath="$PROJECT_DIR$/.idea/modules/flashy_test.iml" group="flashy" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java b/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java
index f127754..6ebbcac 100644
--- a/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java
+++ b/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java
@@ -12,6 +12,7 @@
 
 @Controller
 public class IndexController {
+  public static final int AMOUNT_TO_SHOW = 3;
   private FlashCardService flashCardService;
 
   @Autowired
@@ -22,7 +23,7 @@ public void setFlashCardService(FlashCardService flashCardService) {
   @RequestMapping("/")
   public String index(Model model) {
     StringBuilder ctaBuilder = new StringBuilder();
-    List<FlashCard> cards = flashCardService.getRandomFlashCards(5);
+    List<FlashCard> cards = flashCardService.getRandomFlashCards(AMOUNT_TO_SHOW);
     ctaBuilder.append("Refresh your memory about ");
     for (FlashCard card : cards) {
       ctaBuilder.append(card.getTerm());

From 969d70eb105c173a697394e2664d1ace38b0893c Mon Sep 17 00:00:00 2001
From: David Sampimon <davidsampimon@gmail.com>
Date: Fri, 24 Jan 2020 21:23:39 +0100
Subject: [PATCH 2/2] Addresses bug described in #6 where the total number in
 CTA was off

---
 .../teamtreehouse/flashy/controllers/IndexController.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java b/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java
index 6ebbcac..0b76fae 100644
--- a/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java
+++ b/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java
@@ -31,10 +31,12 @@ public String index(Model model) {
         ctaBuilder.append(", ");
       }
     }
-    ctaBuilder.append(" and ");
     Long totalCount = flashCardService.getCurrentCount();
-    ctaBuilder.append(totalCount);
-    ctaBuilder.append(" more");
+    if(totalCount > AMOUNT_TO_SHOW) {
+        ctaBuilder.append(" and ");
+        ctaBuilder.append(totalCount - AMOUNT_TO_SHOW);
+        ctaBuilder.append(" more");
+    }
     model.addAttribute("cta", ctaBuilder.toString());
     model.addAttribute("flashCardCount", totalCount);
     return "index";