fix(admin): align holiday tests and loading flow

2026-07-02 11:02:20 +09:00
parent 124b3b4dfc
commit e65f01b196
8 changed files with 34 additions and 78 deletions
@@ -7,9 +7,9 @@ public class BusinessDayCalculatorTests
 {
    [Theory]
    [InlineData(2026, 2, 14, 2026, 2, 19)]
-    [InlineData(2026, 8, 15, 2026, 8, 20)]
-    [InlineData(2026, 9, 24, 2026, 9, 29)]
-    [InlineData(2026, 10, 3, 2026, 10, 8)]
+    [InlineData(2026, 8, 15, 2026, 8, 18)]
+    [InlineData(2026, 9, 24, 2026, 9, 28)]
+    [InlineData(2026, 10, 3, 2026, 10, 6)]
    [InlineData(2027, 2, 6, 2027, 2, 10)]
    public void GetEffectiveDueDate_SkipsWeekendHolidayAndSubstituteHoliday(
        int dueYear, int dueMonth, int dueDay,
@@ -112,9 +112,7 @@
                    a.Title.Contains(searchQuery, StringComparison.OrdinalIgnoreCase))
        .OrderBy(a => a.SortOrder) ?? Enumerable.Empty<Announcement>();

-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
+    protected override async Task OnInitializedAsync()
    {
        if (AuthStateTask != null)
        {
@@ -122,8 +120,6 @@
            if (authState.User.Identity?.IsAuthenticated == true)
            {
                await LoadAsync();
-                    StateHasChanged();
-                }
            }
        }
    }
@@ -130,9 +130,7 @@
    private int totalPages;
    private const int PageSize = 20;

-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
+    protected override async Task OnInitializedAsync()
    {
        if (AuthStateTask != null)
        {
@@ -140,8 +138,6 @@
            if (authState.User.Identity?.IsAuthenticated == true)
            {
                await LoadAsync();
-                    StateHasChanged();
-                }
            }
        }
    }
@@ -128,9 +128,7 @@
    private ConsultingActivity? editingActivity;
    private ConsultingActivityForm activityForm = new();

-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
+    protected override async Task OnInitializedAsync()
    {
        if (AuthStateTask != null)
        {
@@ -138,8 +136,6 @@
            if (authState.User.Identity?.IsAuthenticated == true)
            {
                await LoadData();
-                    StateHasChanged();
-                }
            }
        }
    }
@@ -116,9 +116,7 @@
                    (f.Answer != null && f.Answer.Contains(searchQuery, StringComparison.OrdinalIgnoreCase)))
        .OrderBy(f => f.SortOrder) ?? Enumerable.Empty<Faq>();

-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
+    protected override async Task OnInitializedAsync()
    {
        if (AuthStateTask != null)
        {
@@ -126,8 +124,6 @@
            if (authState.User.Identity?.IsAuthenticated == true)
            {
                await LoadAsync();
-                    StateHasChanged();
-                }
            }
        }
    }
@@ -124,9 +124,7 @@
    private bool isDialogOpen;
    private RevenueForm revenueForm = new();

-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
+    protected override async Task OnInitializedAsync()
    {
        if (AuthStateTask != null)
        {
@@ -134,8 +132,6 @@
            if (authState.User.Identity?.IsAuthenticated == true)
            {
                await LoadData();
-                    StateHasChanged();
-                }
            }
        }
    }
@@ -178,9 +178,7 @@ else
    private TaxFilingSchedule? selectedSchedule;
    private TaxFilingScheduleForm scheduleForm = new();
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
+    protected override async Task OnInitializedAsync()
    {
        if (AuthStateTask != null)
        {
@@ -189,8 +187,6 @@ else
            {
                await LoadData();
                PrepareCreate();
-                    StateHasChanged();
-                }
            }
        }
    }
@@ -74,26 +74,6 @@ public static class BusinessDayCalculator
            }
        }

-        // 주말과 연속 공휴일 뒤에 붙는 대체휴일을 다음 영업일로 자동 확장한다.
-        foreach (var window in HolidayWindows)
-        {
-            foreach (var date in window.Dates())
-            {
-                if (date.DayOfWeek is not DayOfWeek.Saturday and not DayOfWeek.Sunday)
-                {
-                    continue;
-                }
-
-                var substitute = date.AddDays(1);
-                while (substitute.DayOfWeek is DayOfWeek.Saturday or DayOfWeek.Sunday || holidays.Contains(substitute))
-                {
-                    substitute = substitute.AddDays(1);
-                }
-
-                holidays.Add(substitute);
-            }
-        }
-
        return holidays;
    }
 }