Day1

build.gradle

@@ -74,16 +74,22 @@ dependencies {
     implementation 'org.postgresql:postgresql:42.2.1'
     implementation 'org.liquibase:liquibase-core'
     implementation 'com.google.code.findbugs:jsr305:1.3.9'
+    implementation 'org.apache.commons:commons-lang3:3.12.0'
+    implementation 'org.junit.jupiter:junit-jupiter:5.7.0'
+    implementation 'org.junit.jupiter:junit-jupiter:5.7.0'
     asciidoctor 'org.springframework.restdocs:spring-restdocs-asciidoctor'
     testImplementation("org.springframework.restdocs:spring-restdocs-mockmvc")
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation 'junit:junit'
+//    testImplementation 'junit:junit'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
     testImplementation 'org.mockito:mockito-inline:2.8.9'
     testImplementation 'com.tngtech.archunit:archunit:0.9.3'
 }
 
 test {
     outputs.dir snippetsDir
+    useJUnitPlatform()
 }
 
 asciidoctor {

frontend/package.json

@@ -10,7 +10,7 @@
     "http-proxy-middleware": "^0.20.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
-    "react-native": "^0.61.5",
+    "react-native": "^0.65.1",
     "react-router-dom": "^5.1.2",
     "react-scripts": "^3.3.0"
   },

frontend/src/components/App.test.js

@@ -17,11 +17,11 @@ describe("App", () => {
     const actualPuzzleCards = component.instance().addPuzzleCards();
 
     expect(
-      actualPuzzleCards.map(card => card.props.result)
+        actualPuzzleCards.map(card => card.props.result)
     ).to.have.all.members(expectedResults);
 
     expect(
-      actualPuzzleCards.map(card => card.props.cardType)
+        actualPuzzleCards.map(card => card.props.cardType)
     ).to.have.all.members(["puzzleCard", "puzzleCard", "puzzleCard"]);
 
     expect(actualPuzzleCards.map(card => card.props.day)).to.have.all.members([
@@ -47,22 +47,22 @@ describe("App", () => {
     expect(component.children().getElements().length).to.equal(2);
 
     expect(component.childAt(0).name()).to.equal(
-      "WithStyles(PrimarySearchAppBar)"
+        "WithStyles(PrimarySearchAppBar)"
     );
     expect(component.childAt(1).name()).to.equal("WithStyles(ForwardRef(Grid))");
 
     expect(
-      component
-        .childAt(1)
-        .children()
-        .getElements().length
-    ).to.equal(3);
+        component
+            .childAt(1)
+            .children()
+            .getElements().length
+    ).to.equal(1);
 
     expect(
-      component
-        .childAt(1)
-        .childAt(0)
-        .name()
+        component
+            .childAt(1)
+            .childAt(0)
+            .name()
     ).to.equal("WithStyles(CardTemplate)");
   });
 
@@ -71,4 +71,4 @@ describe("App", () => {
     ReactDOM.render(<App />, div);
     ReactDOM.unmountComponentAtNode(div);
   });
-});
+});

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Jan 12 18:02:33 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip

src/main/java/org/haffson/adventofcode/Application.java

@@ -13,5 +13,6 @@ public class Application {
 
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
+
     }
 }

src/main/java/org/haffson/adventofcode/ProblemStatusEnum.java

@@ -6,12 +6,18 @@
  * @author Michelle Fernandez Bieber
  */
 public enum ProblemStatusEnum {
-    /** if the puzzle has been solved */
+    /**
+     * if the puzzle has been solved
+     */
     SOLVED,
 
-    /** if the puzzle is being worked on */
+    /**
+     * if the puzzle is being worked on
+     */
     IN_PROGRESS,
 
-    /** if the puzzle hasn't been started yet */
+    /**
+     * if the puzzle hasn't been started yet
+     */
     UNSOLVED
 }

src/main/java/org/haffson/adventofcode/controller/AdventOfCodeController.java

@@ -53,7 +53,8 @@ public AdventOfCodeController(AdventOfCodeService adventOfCodeService) {
      * @return a HATEOAS-{@code Resource<>} with the corresponding solution
      */
     @GetMapping
-    public Resource getResultForASpecificDayAndPuzzlePart(@RequestParam(value = "day", defaultValue = "") String day, @RequestParam(value = "part", defaultValue = "") String part) {
+    public Resource getResultForASpecificDayAndPuzzlePart(@RequestParam(value = "day", defaultValue = "1") Integer day,
+                                                          @RequestParam(value = "part", defaultValue = "1") Integer part){
 
         logger.info("The results for day " + day + ", part " + part + " have been requested.");
 
@@ -81,4 +82,21 @@ public Resources daysImplemented() {
                 linkTo(methodOn(AdventOfCodeController.class).daysImplemented()).withSelfRel()
         );
     }
+
+        @GetMapping("/test")
+        public String test () {
+
+            logger.info("A list of implemented days has been requested.");
+
+            return "Hallo";
+        }
+
+    @GetMapping("/test11")
+    public String test11 () {
+
+        logger.info("A list of implemented days has been requested.");
+
+        return "Hallo11";
+    }
+
 }

src/main/java/org/haffson/adventofcode/days/Days.java

@@ -2,7 +2,8 @@
 
 import org.haffson.adventofcode.ProblemStatusEnum;
 
-import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * An interface for the individual puzzles,
@@ -38,5 +39,5 @@ public interface Days {
      *
      * @return the status of each part
      */
-    HashMap<String, ProblemStatusEnum> getProblemStatus();
+    Map<Integer, ProblemStatusEnum> getProblemStatus();
 }

src/main/java/org/haffson/adventofcode/days/day01/Day01.java

@@ -2,31 +2,35 @@
 
 import org.haffson.adventofcode.ProblemStatusEnum;
 import org.haffson.adventofcode.days.Days;
-import org.haffson.adventofcode.utils.FileReaders;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.haffson.adventofcode.utils.DataLoader;
+import org.haffson.adventofcode.utils.ProblemStatus;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 
 /**
  * Implementation for <i>Day 1: Chronal Calibration</i>.
  */
 @Component
 public class Day01 implements Days {
 
-    /** The puzzle status {@code HashMap} */
-    private final HashMap<String, ProblemStatusEnum> problemStatus;
+    private final Map<Integer, ProblemStatusEnum> problemStatus;
+    private final List<Integer> numbers;
 
-    /**
-     * Causes the input file to be parsed into the frequencies array ({@code frequencies}).
-     *
-     * @param fileReaders {@code @Autowired} fileReader //TODO: inject what you need
-     */
-    @Autowired
-    Day01(FileReaders fileReaders) {
-        this.problemStatus = new HashMap<>();
-        this.problemStatus.put("1", ProblemStatusEnum.UNSOLVED);
-        this.problemStatus.put("2", ProblemStatusEnum.UNSOLVED);
+    public Day01(DataLoader dataLoader) {
+        // get data
+        this.numbers = dataLoader.getDataDay01();
+        // set ProblemStatus
+        this.problemStatus = ProblemStatus.getProblemStatusMap(1, 2,
+                ProblemStatusEnum.SOLVED, ProblemStatusEnum.SOLVED);
+    }
+
+    public List<Integer> getNumbers() {
+        return numbers;
     }
 
     @Override
@@ -35,27 +39,60 @@ public int getDay() {
     }
 
     @Override
-    public HashMap<String, ProblemStatusEnum> getProblemStatus() {
+    public Map<Integer, ProblemStatusEnum> getProblemStatus() {
         return problemStatus;
     }
 
     @Override
     public String firstPart() {
-        return "Part 1 - Frequency: " + calculateFrequency();
+        return "Product 1: " + calculateProduct_Part1(numbers);
     }
 
     @Override
     public String secondPart() {
-        return null;
+        return "Product 2: " + calculateProduct_Part2(numbers);
+    }
+
+    /**
+     * utility method: subtract numbers from 2020
+     */
+    private List<Integer> getSubtractedFrom2020(List<Integer> numbers) {
+        return numbers.stream()
+                .map(value -> 2020 - value)
+                .collect(Collectors.toList());
     }
 
     /**
      * Primary method for Day 1, Part 1.
-     * Calculates the final frequency as the sum of all frequencies.
+     * Calculates the product of two specific numbers from a list
+     *
+     * @return the product
+     */
+    private int calculateProduct_Part1(final List<Integer> numbers) {
+        // check for intersection of two lists
+        numbers.retainAll(getSubtractedFrom2020(numbers));
+        // product of "intersected" values is the puzzle's answer!
+        return numbers.get(0) * numbers.get(1);
+    }
+
+    /**
+     * Primary method for Day 1, Part 2.
+     * Calculates the product of two specific numbers from a list
      *
-     * @return the final frequency
+     * @return the product
      */
-    private int calculateFrequency() {
-        return 0;
+    private int calculateProduct_Part2(final List<Integer> numbers) {
+        List<Integer> numbersSubtractedBy2020 = getSubtractedFrom2020(numbers);
+
+        List<Integer> tempData = new ArrayList<>();
+        for (int k = 0; k < numbers.size(); k++) {
+            for (Integer datum : numbers) {
+                tempData.add(numbers.get(k) + datum);
+            }
+        }
+        // check for intersection of two lists
+        numbersSubtractedBy2020.retainAll(tempData);
+        // product of "intersected" values is the puzzle's answer!
+        return (2020 - numbersSubtractedBy2020.get(0)) * (2020 - numbersSubtractedBy2020.get(1)) * (2020 - numbersSubtractedBy2020.get(2));
     }
-}
+}