chore: fixes to recurring end dates

Author: MrYuion

libs/form-fields/src/lib/recurrence-field.component.ts

@@ -42,7 +42,6 @@ import {
 import { CommonModule } from '@angular/common';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatSelectModule } from '@angular/material/select';
-import { SettingsService } from 'libs/common/src/lib/settings.service';
 import { TranslatePipe } from 'libs/components/src/lib/translate.pipe';
 import { RecurrenceDetails } from 'libs/events/src/lib/event.interfaces';
 import { RecurrenceModalComponent } from './recurrence-modal.component';
@@ -167,7 +166,6 @@ import { RecurrenceModalComponent } from './recurrence-modal.component';
 })
 export class RecurrenceFieldComponent implements ControlValueAccessor, OnInit {
     private _dialog = inject(MatDialog);
-    private _settings = inject(SettingsService);
     private _destroyRef = inject(DestroyRef);
     private _controlContainer = inject(ControlContainer, { optional: true });
 
@@ -280,10 +278,8 @@ export class RecurrenceFieldComponent implements ControlValueAccessor, OnInit {
 
     public setSimple(pattern: string) {
         const day_of_week = new Date(this.date()).getDay();
-        const default_recurrence =
-            this._settings.get('app.default_recurrence_period') || 180;
         const end_date = endOfDay(
-            addDays(this.date(), default_recurrence),
+            addDays(this.date(), this.available_days()),
         ).valueOf();
         if (pattern === 'none') {
             this.setValue(NO_RECURR);
@@ -377,6 +373,17 @@ export class RecurrenceFieldComponent implements ControlValueAccessor, OnInit {
         }
         if (current.end_type === 'instances' && current.end_instances) {
             updated.end_date = this._computeEndDate(current, date_value);
+        } else if (
+            current.end_type === 'date' &&
+            current.end_date &&
+            // end_date is always stored as endOfDay(), so this comparison
+            // is effectively a day-boundary check: reset only when
+            // the entire end day is before the new booking date.
+            current.end_date < date_value
+        ) {
+            updated.end_date = endOfDay(
+                addDays(date_value, this.available_days()),
+            ).valueOf();
         }
         if (Object.keys(updated).length) {
             this.setValue({ ...current, ...updated });

libs/form-fields/src/lib/recurrence-modal.component.ts

@@ -130,6 +130,7 @@ import { DateFieldComponent } from './date-field.component';
                         }}</mat-radio-button>
                         <a-date-field
                             formControlName="end_date"
+                            [from]="date"
                             [to]="end_date"
                         ></a-date-field>
                     </div>
@@ -230,18 +231,13 @@ export class RecurrenceModalComponent extends AsyncHandler implements OnInit {
         week: new FormControl(0),
         monthly_type: new FormControl<MonthlyType>('day_of_month'),
         end_type: new FormControl<RecurrEndType>('never'),
-        end_date: new FormControl(addMonths(Date.now(), 3)),
+        end_date: new FormControl(
+            endOfDay(addDays(this.date, this.available_days)),
+        ),
         end_instances: new FormControl(13),
     });
 
-    constructor() {
-        super();
-    }
-
     public ngOnInit() {
-        if (this.form.value.end_date > this.end_date) {
-            this.form.patchValue({ end_date: this.end_date });
-        }
         this.subscription(
             'end_type',
             this.form.controls.end_type.valueChanges.subscribe((type) =>
@@ -258,6 +254,12 @@ export class RecurrenceModalComponent extends AsyncHandler implements OnInit {
         if (!this.form.value.type || this.form.value.type === 'none') {
             this.form.patchValue({ type: 'daily' });
         }
+        // Clamp end_date to valid range after loading the saved value
+        if (this.form.value.end_date < this.date) {
+            this.form.patchValue({ end_date: this.date });
+        } else if (this.form.value.end_date > this.end_date) {
+            this.form.patchValue({ end_date: this.end_date });
+        }
         this._onEndTypeChange(this.form.value.end_type);
         if (this.form.value.type === 'monthly' && this.form.value.week) {
             const set = this.form.value.weekdays;

libs/form-fields/src/tests/recurrence-field.component.spec.ts

@@ -21,7 +21,6 @@ import {
 import { MockModule, MockProvider } from 'ng-mocks';
 
 import { BookingRecurrence } from '@placeos/common';
-import { SettingsService } from 'libs/common/src/lib/settings.service';
 import { RecurrenceFieldComponent } from '../lib/recurrence-field.component';
 
 // ---------------------------------------------------------------------------
@@ -52,10 +51,7 @@ describe('RecurrenceFieldComponent – date change regression', () => {
     const createComponent = createComponentFactory({
         component: RecurrenceFieldComponent,
         imports: [MockModule(MatFormFieldModule), MockModule(MatSelectModule)],
-        providers: [
-            MockProvider(SettingsService, { get: jest.fn() }),
-            MockProvider(MatDialog, { open: jest.fn() }),
-        ],
+        providers: [MockProvider(MatDialog, { open: jest.fn() })],
     });
 
     /** Update the date signal input and flush effects. */
@@ -295,8 +291,14 @@ describe('RecurrenceFieldComponent – date change regression', () => {
                 endOfMonth(addMonths(mar15, 2)).valueOf(),
             );
         });
+    });
 
-        it('should NOT change end_date when end_type is "date"', () => {
+    // -----------------------------------------------------------------------
+    // Date-based end_date is clamped when booking date moves past it
+    // -----------------------------------------------------------------------
+    describe('date-based end_date is clamped when booking date moves forward', () => {
+        it('should NOT change end_date when end_type is "date" and new date is still before end_date', () => {
+            // end_date is June 30; new booking date Feb 1 is still well before it
             const fixed_end = new Date(2024, 5, 30).valueOf();
             setDate(new Date(2024, 0, 8).valueOf());
             spectator.component.setValue({
@@ -310,8 +312,54 @@ describe('RecurrenceFieldComponent – date change regression', () => {
 
             setDate(new Date(2024, 1, 1).valueOf());
 
+            // end_date is still in the future relative to the new booking date
+            // so it should remain unchanged
             expect(spectator.component.value().end_date).toBe(fixed_end);
         });
+
+        it('should update end_date when booking date moves past the recurrence end_date', () => {
+            // Set up weekly recurrence ending April 5, 2024
+            const apr5 = new Date(2024, 3, 5).valueOf();
+            setDate(new Date(2024, 2, 1).valueOf()); // booking date: March 1
+            spectator.component.setValue({
+                _custom: true,
+                type: 'weekly',
+                interval: 1,
+                weekdays: new Set([5 as any]), // Friday
+                end_type: 'date',
+                end_date: apr5,
+            });
+
+            // Move booking date to April 10 – now AFTER the end_date of April 5
+            const apr10 = new Date(2024, 3, 10).valueOf();
+            setDate(apr10);
+
+            // end_date must be >= new booking date; stale April 5 is invalid
+            expect(spectator.component.value().end_date).toBeGreaterThanOrEqual(
+                apr10,
+            );
+        });
+
+        it('should NOT change end_date when booking date moves forward but stays before end_date', () => {
+            // Set up weekly recurrence ending April 30, 2024
+            const apr30 = new Date(2024, 3, 30).valueOf();
+            setDate(new Date(2024, 2, 1).valueOf()); // booking date: March 1
+            spectator.component.setValue({
+                _custom: true,
+                type: 'weekly',
+                interval: 1,
+                weekdays: new Set([5 as any]), // Friday
+                end_type: 'date',
+                end_date: apr30,
+            });
+
+            // Move booking date to April 10 – still BEFORE the end_date of April 30
+            const apr10 = new Date(2024, 3, 10).valueOf();
+            setDate(apr10);
+
+            // end_date should remain unchanged because it is still in the future
+            expect(spectator.component.value().end_date).toBe(apr30);
+        });
     });
 
     // -----------------------------------------------------------------------