@tuturuuu/ui 0.33.0 → 0.34.0

package/src/components/ui/finance/invoices/utils.ts

@@ -1,3 +1,18 @@
+import {
+  getSubscriptionCoverageInvoiceForGroup,
+  isSubscriptionMonthPaidForGroup,
+  type SubscriptionCoverageInvoice,
+} from './subscription-coverage';
+
+export {
+  getSubscriptionCoverageInvoiceForGroup,
+  isSubscriptionMonthCoveredByInvoice,
+  isSubscriptionMonthPaidForGroup,
+  isSubscriptionRangeFullyPaidForGroups,
+  isSubscriptionRangePaidForGroup,
+  type SubscriptionCoverageInvoice,
+} from './subscription-coverage';
+
 import type { Database } from '@tuturuuu/types';
 import {
   formatMonthLabel,
@@ -48,12 +63,6 @@ export type UserGroup = {
   workspace_user_groups: WorkspaceUserGroup | null;
 };
 
-export type SubscriptionCoverageInvoice = {
-  created_at?: string | null;
-  group_id?: string;
-  valid_until?: string | null;
-};
-
 export type BillableSession = {
   date: string;
   groupId: string;
@@ -114,99 +123,6 @@ export const resolveSubscriptionInvoiceCategoryId = ({
   return defaultCategoryId ?? '';
 };
 
-const getComparableTimestamp = (value: string | null | undefined): number => {
-  if (!value) return 0;
-  const timestamp = new Date(value).getTime();
-  return Number.isNaN(timestamp) ? 0 : timestamp;
-};
-
-const getComparableValidUntilTimestamp = (
-  invoice: SubscriptionCoverageInvoice
-): number => {
-  const validUntil = parseLocalCalendarDate(invoice.valid_until);
-  return Number.isNaN(validUntil.getTime()) ? 0 : validUntil.getTime();
-};
-
-export const getSubscriptionCoverageInvoiceForGroup = (
-  latestInvoices: SubscriptionCoverageInvoice[],
-  groupId: string
-): SubscriptionCoverageInvoice | undefined =>
-  latestInvoices
-    .filter((invoice) => invoice.group_id === groupId)
-    .filter((invoice) => getComparableValidUntilTimestamp(invoice) > 0)
-    .sort((a, b) => {
-      const validUntilDiff =
-        getComparableValidUntilTimestamp(b) -
-        getComparableValidUntilTimestamp(a);
-      if (validUntilDiff !== 0) return validUntilDiff;
-
-      return (
-        getComparableTimestamp(b.created_at) -
-        getComparableTimestamp(a.created_at)
-      );
-    })[0];
-
-export const isSubscriptionMonthCoveredByInvoice = (
-  selectedMonth: string,
-  invoice: SubscriptionCoverageInvoice | null | undefined
-): boolean => {
-  if (!invoice?.valid_until) return false;
-
-  const selectedMonthStart = getMonthStartDate(selectedMonth);
-  const validUntilMonthStart = getMonthStartDate(invoice.valid_until);
-
-  if (
-    Number.isNaN(selectedMonthStart.getTime()) ||
-    Number.isNaN(validUntilMonthStart.getTime())
-  ) {
-    return false;
-  }
-
-  return selectedMonthStart < validUntilMonthStart;
-};
-
-export const isSubscriptionMonthPaidForGroup = (
-  groupId: string,
-  selectedMonth: string,
-  latestInvoices: SubscriptionCoverageInvoice[]
-): boolean =>
-  isSubscriptionMonthCoveredByInvoice(
-    selectedMonth,
-    getSubscriptionCoverageInvoiceForGroup(latestInvoices, groupId)
-  );
-
-export const isSubscriptionRangePaidForGroup = (
-  groupId: string,
-  selectedMonth: string,
-  prepaidMonthCount: number,
-  latestInvoices: SubscriptionCoverageInvoice[]
-): boolean => {
-  const coverageMonths = getCoverageMonths(selectedMonth, prepaidMonthCount);
-  if (coverageMonths.length === 0) return false;
-
-  return coverageMonths.every((month) =>
-    isSubscriptionMonthPaidForGroup(groupId, month, latestInvoices)
-  );
-};
-
-export const isSubscriptionRangeFullyPaidForGroups = (
-  groupIds: string[],
-  selectedMonth: string,
-  prepaidMonthCount: number,
-  latestInvoices: SubscriptionCoverageInvoice[]
-): boolean => {
-  if (groupIds.length === 0) return false;
-
-  return groupIds.every((groupId) =>
-    isSubscriptionRangePaidForGroup(
-      groupId,
-      selectedMonth,
-      prepaidMonthCount,
-      latestInvoices
-    )
-  );
-};
-
 export const getAttendanceStats = (
   attendance: AttendanceRecord[]
 ): AttendanceStats => {
@@ -251,7 +167,7 @@ const getGroupValidUntilDate = (
   groupId: string
 ): Date | null => {
   const latestInvoice = getSubscriptionCoverageInvoiceForGroup(
-    latestInvoices,
+    latestInvoices.filter((invoice) => invoice.covered_months == null),
     groupId
   );
   if (!latestInvoice?.valid_until) return null;
@@ -285,7 +201,11 @@ export const getBillableSessionsForGroups = (
       (candidate) => candidate.workspace_user_groups?.id === groupId
     )?.workspace_user_groups;
 
-    if (!group?.sessions?.length) return [];
+    if (
+      !group?.sessions?.length ||
+      isSubscriptionMonthPaidForGroup(groupId, selectedMonth, latestInvoices)
+    )
+      return [];
 
     const validUntil = getGroupValidUntilDate(latestInvoices, groupId);
 
@@ -330,7 +250,12 @@ export const getBillableAttendanceRecords = (
 
   return attendance.filter((record) => {
     const groupId = record.group_id;
-    if (!groupId || !groupIds.includes(groupId)) return false;
+    if (
+      !groupId ||
+      !groupIds.includes(groupId) ||
+      isSubscriptionMonthPaidForGroup(groupId, selectedMonth, latestInvoices)
+    )
+      return false;
 
     const attendanceDate = parseLocalCalendarDate(record.date);
     if (!isDateInMonth(attendanceDate, selectedMonth)) return false;
@@ -668,9 +593,10 @@ const EXPIRING_SOON_DAYS = 14;
 export type GroupPaymentStatus = 'active' | 'expiringSoon' | 'expired';
 export function getGroupPaymentStatus(
   group: WorkspaceUserGroup | null,
-  latestInvoice:
-    | { valid_until?: string | null; created_at?: string | null }
-    | undefined
+  latestInvoice: SubscriptionCoverageInvoice | undefined,
+  coverageInvoices: SubscriptionCoverageInvoice[] = latestInvoice
+    ? [latestInvoice]
+    : []
 ): GroupPaymentStatus {
   const today = new Date();
   today.setHours(0, 0, 0, 0);
@@ -685,9 +611,25 @@ export function getGroupPaymentStatus(
     if (today > endDate) return 'expired';
   }
 
-  const validUntil = latestInvoice?.valid_until
+  let validUntil = latestInvoice?.valid_until
     ? parseLocalCalendarDate(latestInvoice.valid_until)
     : null;
+  if (coverageInvoices.some((invoice) => invoice.covered_months != null)) {
+    const cursor = new Date(today.getFullYear(), today.getMonth(), 1);
+    const month = () =>
+      `${cursor.getFullYear()}-${String(cursor.getMonth() + 1).padStart(2, '0')}`;
+    if (!isSubscriptionMonthPaidForGroup(group.id, month(), coverageInvoices))
+      return 'expired';
+    // Walk contiguous paid months so a later payment cannot conceal a gap.
+    for (
+      let i = 0;
+      i < 1200 &&
+      isSubscriptionMonthPaidForGroup(group.id, month(), coverageInvoices);
+      i++
+    )
+      cursor.setMonth(cursor.getMonth() + 1);
+    validUntil = cursor;
+  }
   if (validUntil) {
     validUntil.setHours(0, 0, 0, 0);
     const daysUntilExpiry = Math.ceil(

package/src/components/ui/legacy/calendar/all-day-event-bar.tsx

@@ -12,8 +12,9 @@ import timezone from 'dayjs/plugin/timezone';
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { MIN_COLUMN_WIDTH } from './config';
 import { CalendarEventProviderIcon } from './event-provider-display';
-import { getLocationType, LocationTimeline } from './location-timeline';
+import { LocationTimeline } from './location-timeline';
 import { useCalendarSettings } from './settings/settings-context';
+import { getEventLocationType } from './working-location';
 
 dayjs.extend(isBetween);
 dayjs.extend(isSameOrAfter);
@@ -22,7 +23,6 @@ dayjs.extend(timezone);
 
 const MAX_EVENTS_DISPLAY = 2;
 
-// Define types for better type safety
 interface EventSpan {
   event: CalendarEvent;
   startIndex: number;
@@ -490,11 +490,11 @@ export const AllDayEventBar = ({ dates }: { dates: Date[] }) => {
     // Location events will be rendered separately as a compact timeline strip
     // Extract location spans before filtering them out for row assignment
     const locationSpansFromMerge = mergedTempSpans
-      .filter((span) => getLocationType(span.event.title ?? '') !== null)
+      .filter((span) => getEventLocationType(span.event) !== null)
       .map((span) => ({ ...span, row: 0 })); // Give them row 0 as placeholder
 
     const nonLocationSpans = mergedTempSpans.filter(
-      (span) => getLocationType(span.event.title ?? '') === null
+      (span) => getEventLocationType(span.event) === null
     );
 
     // Sort: 1) by span length (longer events first for better packing), 2) by start date
@@ -628,7 +628,7 @@ export const AllDayEventBar = ({ dates }: { dates: Date[] }) => {
   // Get non-location spans for regular event display
   const regularSpans = useMemo(() => {
     return eventLayout.spans.filter(
-      (span) => getLocationType(span.event.title ?? '') === null
+      (span) => getEventLocationType(span.event) === null
     );
   }, [eventLayout.spans]);
 

package/src/components/ui/legacy/calendar/location-timeline.tsx

@@ -22,6 +22,7 @@ import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
 import timezone from 'dayjs/plugin/timezone';
 import { useCallback, useEffect, useState } from 'react';
+import { getEventLocationType } from './working-location';
 
 dayjs.extend(timezone);
 dayjs.extend(isBetween);
@@ -47,19 +48,6 @@ interface EventSpan {
   mergedEventIds?: string[];
 }
 
-type LocationType = 'home' | 'office' | 'school' | 'custom' | null;
-
-// Helper to determine location type
-export const getLocationType = (title: string): LocationType => {
-  const normalizedTitle = title.toLowerCase().trim();
-  if (normalizedTitle === 'home') return 'home';
-  if (normalizedTitle === 'office' || normalizedTitle === 'work')
-    return 'office';
-  if (normalizedTitle === 'school') return 'school';
-  if (title.startsWith('📍') || title.startsWith('Location: ')) return 'custom';
-  return null;
-};
-
 // Location colors using dynamic theme tokens
 const locationStyles = {
   home: {
@@ -156,7 +144,7 @@ const LocationPill = ({
   );
 
   const { event, startIndex, span } = eventSpan;
-  const locationType = getLocationType(event.title ?? '');
+  const locationType = getEventLocationType(event);
   const isHome = locationType === 'home';
   const isOffice = locationType === 'office';
   const isSchool = locationType === 'school';

package/src/components/ui/legacy/calendar/working-location.test.ts

@@ -0,0 +1,47 @@
+import type { CalendarEvent } from '@tuturuuu/types/primitives/calendar-event';
+import { describe, expect, it } from 'vitest';
+import { getEventLocationType } from './working-location';
+
+const event = (overrides: Partial<CalendarEvent>): CalendarEvent => ({
+  id: 'event',
+  start_at: '2026-09-25T00:00:00Z',
+  end_at: '2026-09-26T00:00:00Z',
+  ...overrides,
+});
+
+describe('Google working locations', () => {
+  it('uses provider metadata even when the title differs', () => {
+    expect(
+      getEventLocationType(
+        event({
+          title: 'Remote today',
+          scheduling_metadata: {
+            google_event_type: 'workingLocation',
+            google_working_location_type: 'homeOffice',
+          },
+        })
+      )
+    ).toBe('home');
+  });
+
+  it('keeps legacy Home and Office location events visible', () => {
+    expect(getEventLocationType(event({ title: 'Home' }))).toBe('home');
+    expect(getEventLocationType(event({ title: 'Office' }))).toBe('office');
+    expect(getEventLocationType(event({ title: 'School' }))).toBe('school');
+  });
+
+  it('displays custom Google School locations distinctly', () => {
+    expect(
+      getEventLocationType(
+        event({
+          title: 'Campus',
+          scheduling_metadata: {
+            google_event_type: 'workingLocation',
+            google_working_location_type: 'customLocation',
+            google_working_location_label: 'School',
+          },
+        })
+      )
+    ).toBe('school');
+  });
+});

package/src/components/ui/legacy/calendar/working-location.ts

@@ -0,0 +1,35 @@
+import type { CalendarEvent } from '@tuturuuu/types/primitives/calendar-event';
+
+export type LocationType = 'home' | 'office' | 'school' | 'custom' | null;
+
+export function getLocationType(title: string): LocationType {
+  const normalizedTitle = title.toLowerCase().trim();
+  if (normalizedTitle === 'home') return 'home';
+  if (normalizedTitle === 'office' || normalizedTitle === 'work')
+    return 'office';
+  if (normalizedTitle === 'school') return 'school';
+  if (title.startsWith('📍') || title.startsWith('Location: ')) return 'custom';
+  return null;
+}
+
+export function getEventLocationType(event: CalendarEvent): LocationType {
+  if (event.scheduling_metadata?.google_event_type === 'workingLocation') {
+    switch (event.scheduling_metadata.google_working_location_type) {
+      case 'homeOffice':
+        return 'home';
+      case 'officeLocation':
+        return 'office';
+      case 'customLocation': {
+        const label = event.scheduling_metadata.google_working_location_label;
+        return (typeof label === 'string' &&
+          label.trim().toLowerCase() === 'school') ||
+          event.title?.trim().toLowerCase() === 'school'
+          ? 'school'
+          : 'custom';
+      }
+      default:
+        return 'custom';
+    }
+  }
+  return getLocationType(event.title ?? '');
+}