From 4334710cb406e4aae96822362b091b65587ab6e1 Mon Sep 17 00:00:00 2001
From: Michael Carrion Lopez <gcarrion03@gmail.com>
Date: Sun, 28 Jan 2018 17:45:46 -0500
Subject: [PATCH 1/4] This addresses issue number 6 by changing the number of
 examples to 3

---
 .../com/teamtreehouse/flashy/controllers/IndexController.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java b/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java
index f127754..06deed5 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 = 5;
   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 ea869d4cfa15d54ed7853dff992f2e44177d8e57 Mon Sep 17 00:00:00 2001
From: Michael Carrion Lopez <gcarrion03@gmail.com>
Date: Sun, 28 Jan 2018 17:54:27 -0500
Subject: [PATCH 2/4] Addresed bug described in #6

---
 .../flashy/controllers/IndexController.java            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java b/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java
index 06deed5..79d476d 100644
--- a/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java
+++ b/src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java
@@ -12,7 +12,7 @@
 
 @Controller
 public class IndexController {
-  public static final int AMOUNT_TO_SHOW = 5;
+  public static final int AMOUNT_TO_SHOW = 3;
   private FlashCardService flashCardService;
 
   @Autowired
@@ -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";

From 07104159b45698a4b2360672665cdfb1c1df2199 Mon Sep 17 00:00:00 2001
From: Michael Carrion Lopez <gcarrion03@gmail.com>
Date: Thu, 15 Feb 2018 21:54:32 -0500
Subject: [PATCH 3/4] fixes # 5 by making the cards display more standard

---
 .../teamtreehouse/flashy/services/FlashCardServiceImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/teamtreehouse/flashy/services/FlashCardServiceImpl.java b/src/main/java/com/teamtreehouse/flashy/services/FlashCardServiceImpl.java
index 5b660e9..718cf5f 100644
--- a/src/main/java/com/teamtreehouse/flashy/services/FlashCardServiceImpl.java
+++ b/src/main/java/com/teamtreehouse/flashy/services/FlashCardServiceImpl.java
@@ -62,10 +62,10 @@ public FlashCard getNextFlashCardBasedOnViews(Map<Long, Long> idToViewCounts) {
         continue;
       }
       Long lowestScore = idToViewCounts.get(leastViewedId);
-      if (entry.getValue() >= lowestScore) {
-        break;
+      if (entry.getValue() < lowestScore) {
+        leastViewedId = entry.getKey();
       }
-      leastViewedId = entry.getKey();
+
     }
     return flashCardRepository.findOne(leastViewedId);
   }

From 8aad7f96f61383ad2a2d8ed13d471ea43440917e Mon Sep 17 00:00:00 2001
From: Michael Carrion Lopez <gcarrion03@gmail.com>
Date: Thu, 15 Feb 2018 21:56:22 -0500
Subject: [PATCH 4/4] fixes # 5 by making the cards display more standard

---
 .idea/codeStyleSettings.xml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .idea/codeStyleSettings.xml

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
new file mode 100644
index 0000000..5dfbdec
--- /dev/null
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value />
+    </option>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="GoogleStyle" />
+  </component>
+</project>
\ No newline at end of file