refactor(puzzles): 2018/day02 refactor

obalunenko · Nov 4, 2021 · ecea98f · ecea98f
1 parent f782dd8
commit ecea98f
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 24 deletions.
diff --git a/internal/puzzles/solutions/2018/day01/solution.go b/internal/puzzles/solutions/2018/day01/solution.go
@@ -64,23 +64,16 @@ func part1(in io.Reader) (string, error) {
 	for scanner.Scan() {
 		line := scanner.Text()
 
-		matches := re.FindStringSubmatch(line)
-
-		if len(matches) != totalmatches {
-			return "", fmt.Errorf("wrong matches[%d] for line[%s], should be [%d]",
-				len(matches), line, totalmatches)
-		}
-
-		d, err := strconv.Atoi(matches[digits])
+		delta, err := getFreqDelta(line)
 		if err != nil {
-			return "", fmt.Errorf("strconv atoi: %w", err)
+			return "", err
 		}
 
-		switch matches[sign] {
+		switch delta.sign {
 		case "+":
-			curfreq += d
+			curfreq += delta.d
 		case "-":
-			curfreq -= d
+			curfreq -= delta.d
 		}
 	}
 
@@ -118,23 +111,16 @@ func part2(in io.Reader) (string, error) {
 		for scanner.Scan() {
 			line := scanner.Text()
 
-			matches := re.FindStringSubmatch(line)
-
-			if len(matches) != totalmatches {
-				return "", fmt.Errorf("wrong matches[%d] for line[%s], should be [%d]",
-					len(matches), line, totalmatches)
-			}
-
-			d, err := strconv.Atoi(matches[digits])
+			delta, err := getFreqDelta(line)
 			if err != nil {
-				return "", fmt.Errorf("strconv atoi: %w", err)
+				return "", err
 			}
 
-			switch matches[sign] {
+			switch delta.sign {
 			case "+":
-				curfreq += d
+				curfreq += delta.d
 			case "-":
-				curfreq -= d
+				curfreq -= delta.d
 			}
 
 			if seenfreqs[curfreq] {
@@ -155,3 +141,27 @@ func part2(in io.Reader) (string, error) {
 
 	return strconv.Itoa(curfreq), nil
 }
+
+type freqDelta struct {
+	sign string
+	d    int
+}
+
+func getFreqDelta(line string) (freqDelta, error) {
+	matches := re.FindStringSubmatch(line)
+
+	if len(matches) != totalmatches {
+		return freqDelta{}, fmt.Errorf("wrong matches[%d] for line[%s], should be [%d]",
+			len(matches), line, totalmatches)
+	}
+
+	d, err := strconv.Atoi(matches[digits])
+	if err != nil {
+		return freqDelta{}, fmt.Errorf("strconv atoi: %w", err)
+	}
+
+	return freqDelta{
+		sign: matches[sign],
+		d:    d,
+	}, nil
+}
diff --git a/internal/puzzles/solutions/2018/day01/solution_test.go b/internal/puzzles/solutions/2018/day01/solution_test.go
@@ -196,3 +196,51 @@ func Test_solution_Part2(t *testing.T) {
 		})
 	}
 }
+
+func Test_getFreqDelta(t *testing.T) {
+	type args struct {
+		line string
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    freqDelta
+		wantErr bool
+	}{
+		{
+			name: "",
+			args: args{
+				line: "+2",
+			},
+			want: freqDelta{
+				sign: "+",
+				d:    2,
+			},
+			wantErr: false,
+		},
+		{
+			name: "",
+			args: args{
+				line: "2",
+			},
+			want: freqDelta{
+				sign: "",
+				d:    0,
+			},
+			wantErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := getFreqDelta(tt.args.line)
+			if tt.wantErr {
+				assert.Error(t, err)
+
+				return
+			}
+
+			assert.NoError(t, err)
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}