Merge pull request #1 from kpfromer/bogus-counting

Fixed issue treehouse-projects#5 by making the cards displayed more standard

Author: kpfromer

src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java

@@ -34,7 +34,7 @@ public String index(Model model) {
     Long totalCount = flashCardService.getCurrentCount();
       if (totalCount > MAX_ITEMS_TO_SHOW) {
           ctaBuilder.append(" and ");
-          ctaBuilder.append(totalCount);
+          ctaBuilder.append(totalCount - MAX_ITEMS_TO_SHOW);
           ctaBuilder.append(" more");
       }
 

src/main/java/com/teamtreehouse/flashy/services/FlashCardServiceImpl.java

@@ -63,9 +63,8 @@ public FlashCard getNextFlashCardBasedOnViews(Map<Long, Long> idToViewCounts) {
       }
       Long lowestScore = idToViewCounts.get(leastViewedId);
       if (entry.getValue() >= lowestScore) {
-        break;
+        leastViewedId = entry.getKey();
       }
-      leastViewedId = entry.getKey();
     }
     return flashCardRepository.findOne(leastViewedId);
   }