Merge branch 'main' into consent-cli

internal/report/report.go

@@ -141,16 +141,15 @@ func GetPeriodStart(period int, t time.Time) (int64, error) {
 //
 // For example, given reports 1 and 7, with time 2 and period 7, the function will return the path for report 1.
 func GetForPeriod(dir string, t time.Time, period int) (Report, error) {
-	if period <= 0 {
-		return Report{}, ErrInvalidPeriod
+	periodStart, err := GetPeriodStart(period, t)
+	if err != nil {
+		return Report{}, err
 	}
-
-	periodStart := t.Unix() - (t.Unix() % int64(period))
 	periodEnd := periodStart + int64(period)
 
 	// Reports names are utc timestamps. Get the most recent report within the period window.
 	var report Report
-	err := filepath.WalkDir(dir, func(path string, d os.DirEntry, err error) error {
+	err = filepath.WalkDir(dir, func(path string, d os.DirEntry, err error) error {
 		if err != nil {
 			return fmt.Errorf("failed to access path: %v", err)
 		}

internal/report/report_test.go

@@ -21,8 +21,9 @@ func TestGetPeriodStart(t *testing.T) {
 
 		wantErr error
 	}{
-		"Valid Period":   {period: 500, time: 100000},
-		"Negative Time:": {period: 500, time: -100000},
+		"Valid Period":      {period: 500, time: 100000},
+		"Negative Time:":    {period: 500, time: -100000},
+		"Non-Multiple Time": {period: 500, time: 1051},
 
 		"Invalid Negative Period": {period: -500, wantErr: report.ErrInvalidPeriod},
 		"Invalid Zero Period":     {period: 0, wantErr: report.ErrInvalidPeriod},

internal/report/testdata/TestGetPeriodStart/golden/non-multiple_time

@@ -0,0 +1 @@
+1000