Fix

bannzai · Jan 15, 2025 · b80cdc4 · b80cdc4
1 parent 439e6d2
commit b80cdc4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/entity/pill_sheet_group.codegen.dart b/lib/entity/pill_sheet_group.codegen.dart
@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:pilll/entity/firestore_timestamp_converter.dart';
@@ -349,12 +351,12 @@ extension PillSheetGroupPillNumberDomain on PillSheetGroup {
             if (endPillNumber < pillMark.number) {
               if (beginPillNumber != null) {
                 final beginPillNumberOffset = beginPillNumber - 1;
-                final number = pillMark.number % endPillNumber + (beginPillNumberOffset * sliceIndex);
+                final number = max(pillMark.number % endPillNumber, 1) + (beginPillNumberOffset * max(sliceIndex, 1));
                 debugPrint(
                     'number: $number, endPillNumber: $endPillNumber, pillMark.number: ${pillMark.number}, sliceIndex: $sliceIndex, date: ${pillMark.date}');
-                pillMarks[pillMarkIndex] = pillMark.copyWith(number: number);
+                pillMarks[pillMarkIndex] = pillMark.copyWith(number: number.toInt());
               } else {
-                final number = pillMark.number % endPillNumber;
+                final number = max(pillMark.number % endPillNumber, 1);
                 debugPrint(
                     'number: $number, endPillNumber: $endPillNumber, pillMark.number: ${pillMark.number}, sliceIndex: $sliceIndex, date: ${pillMark.date}');
                 pillMarks[pillMarkIndex] = pillMark.copyWith(number: number);

diff --git a/test/entity/pill_sheet_group_test.dart b/test/entity/pill_sheet_group_test.dart
@@ -1243,7 +1243,7 @@ void main() {
             displayNumberSetting: const PillSheetGroupDisplayNumberSetting(beginPillNumber: 2, endPillNumber: 28),
             pillSheetAppearanceMode: PillSheetAppearanceMode.sequential,
           );
-          expect(pillSheetGroup.sequentialLastTakenPillNumber, 2);
+          expect(pillSheetGroup.sequentialLastTakenPillNumber, 3);
         });
       });
     });