@mody-park-cha-raja/finance_common 4.29.1-beta.9 → 4.30.0

package/dist/index.d.mts

@@ -918,6 +918,26 @@ type FlatScopeRow = {
 declare function getWingSelectionLabel(selection: string, specials?: readonly string[]): string;
 declare function getWingSelectionSlug(selection: string, specials?: readonly string[]): string;
 declare function buildWingWiseCollectionReport(donations: WingCollectionDonationLike[], year: number, selection: string, flats?: readonly FlatScopeRow[]): WingCollectionReport;
+/** Donation shape matched by flat entity id (flatId-only reads). */
+interface WingCollectionDonationByIdLike {
+    flatId?: Nullable<number>;
+    amount: number;
+    receiptNumber?: string;
+    paymentType?: string;
+    createdOn?: number;
+}
+type FlatIdScopeRow = {
+    id: number;
+    wing?: string | null;
+    unitNumber: string;
+};
+/**
+ * flatId-keyed variant of buildWingWiseCollectionReport — donations are
+ * grouped by their flat ENTITY id and labels derive from the flat itself.
+ * Donations without a resolvable flat are silently excluded. The flats list
+ * is required (ids cannot be inferred from statics).
+ */
+declare function buildWingWiseCollectionReportByFlatId(donations: WingCollectionDonationByIdLike[], year: number, selection: string, flats: readonly FlatIdScopeRow[]): WingCollectionReport;
 declare function buildWingWiseCollectionWorkbook(report: WingCollectionReport): XLSX.WorkBook;
 
 type XlsxSerializationType = 'base64' | 'array' | 'binary';
@@ -1127,4 +1147,4 @@ declare function isSpecialFlatLabel(label: string): boolean;
 declare function getFlatValidationErrors(input: Partial<IFlatEntity>): FlatValidationError[];
 declare function validateFlatOrThrow(input: Partial<IFlatEntity>): void;
 
-export { ALL_WINGS_SELECTION, BadRequestException, BaseEntityModel, ConfigurationKey, ConfigurationModel, ConfigurationType, DateCodeUtils, DateUtil, DonationHistoryModel, DonationModel, EntityFilterDataHelper, EntityHistoryOperation, EntityList, type EntityListEntityModelMap, type EntityModelType, EntityStatus, type EntityType, ExpenseHeadHistoryModel, ExpenseHeadModel, ExpenseHistoryModel, ExpenseModel, FLATS_BY_WING, FLAT_DONATION_RELATION_CONFIG, FLAT_NUMBERS, FLAT_UNIT_NUMBER_PATTERN, FLAT_WING_PATTERN, type FlatCollectionEntry, type FlatCollectionStatus, type FlatDonationLike, FlatHistoryModel, type FlatIdDonationLike, FlatModel, type FlatOption, type FlatParseResult, type FlatValidationError, ForbiddenException, HttpException, type IAuditColumnEntity, type IBaseHistoryEntity, type ICashBookEntry, type IConfigurationCreateDto, type IConfigurationEntity, type IConfigurationSearchDto, type IConfigurationUpdateDto, type IDonationCreateDto, type IDonationEntity, type IDonationHistoryEntity, type IDonationSearchDto, type IDonationUpdateDto, type IDtoValidationError, type IEntityCreateDto, type IEntityFilterData, type IEntityFilterSearchData, type IEntityFilterSearchDataV2, type IEntityUpdateDto, type IExpenseCreateDto, type IExpenseEntity, type IExpenseHeadCreateDto, type IExpenseHeadEntity, type IExpenseHeadHistoryEntity, type IExpenseHeadSearchDto, type IExpenseHeadUpdateDto, type IExpenseHistoryEntity, type IExpenseSearchDto, type IExpenseUpdateDto, type IFlatCreateDto, type IFlatEntity, type IFlatHistoryEntity, type IFlatSearchDto, type IFlatUpdateDto, type IMappingPropertyEntry, type IModelRelationConfig, type ISearchV2Response, type ISponsorCreateDto, type ISponsorEntity, type ISponsorHistoryEntity, type ISponsorSearchDto, type ISponsorUpdateDto, type ITransactionCreateDto, type ITransactionEntity, type ITransactionHistoryEntity, type ITransactionSearchDto, type ITransactionUpdateDto, type IUserCreateDto, type IUserEntity, type IUserHistoryEntity, type IUserSearchDto, type IUserUpdateDto, type IVendorCreateDto, type IVendorEntity, type IVendorHistoryEntity, type IVendorSearchDto, type IVendorUpdateDto, NotFoundException, type Nullable, OrderByDirection, PAYMENT_OPTIONS, PaymentType, ReferenceIdPrefix, RelationType, SHOP_UNIT_NUMBER_PATTERN, SHOP_WING, SPECIAL_FLATS, SPECIAL_FLAT_LABELS, SponsorHistoryModel, SponsorModel, SponsorTier, TransactionEntityType, TransactionHistoryModel, TransactionModel, TransactionType, USER_RELATION_CONFIG, UnauthorizedException, type UserExpenseReport, type UserExpenseReportTotals, type UserExpenseRow, UserHistoryModel, UserModel, VendorHistoryModel, VendorModel, VendorType, WINGS, WING_ALPHABETS, type WingCollectionDonationLike, type WingCollectionReport, type WingCollectionRow, type WingCollectionTotals, type XlsxCellAddress, type XlsxMergeRange, type XlsxSerializationType, type XlsxSheetInput, type XlsxSheetOptions, buildUserExpenseReport, buildUserExpenseWorkbook, buildWingWiseCollectionReport, buildWingWiseCollectionWorkbook, buildXlsxWorkbook, convertNumberToWords, definedValues, diffArrays, entityListEntityModelMap, epochToReadableDate, getFlatValidationErrors, getObjectDiffingKeys, getWingSelectionLabel, getWingSelectionSlug, groupBy, isSpecialFlatLabel, isValidFlatWing, roundToTwoDecimals, serializeXlsx, validateFlatOrThrow };
+export { ALL_WINGS_SELECTION, BadRequestException, BaseEntityModel, ConfigurationKey, ConfigurationModel, ConfigurationType, DateCodeUtils, DateUtil, DonationHistoryModel, DonationModel, EntityFilterDataHelper, EntityHistoryOperation, EntityList, type EntityListEntityModelMap, type EntityModelType, EntityStatus, type EntityType, ExpenseHeadHistoryModel, ExpenseHeadModel, ExpenseHistoryModel, ExpenseModel, FLATS_BY_WING, FLAT_DONATION_RELATION_CONFIG, FLAT_NUMBERS, FLAT_UNIT_NUMBER_PATTERN, FLAT_WING_PATTERN, type FlatCollectionEntry, type FlatCollectionStatus, type FlatDonationLike, FlatHistoryModel, type FlatIdDonationLike, FlatModel, type FlatOption, type FlatParseResult, type FlatValidationError, ForbiddenException, HttpException, type IAuditColumnEntity, type IBaseHistoryEntity, type ICashBookEntry, type IConfigurationCreateDto, type IConfigurationEntity, type IConfigurationSearchDto, type IConfigurationUpdateDto, type IDonationCreateDto, type IDonationEntity, type IDonationHistoryEntity, type IDonationSearchDto, type IDonationUpdateDto, type IDtoValidationError, type IEntityCreateDto, type IEntityFilterData, type IEntityFilterSearchData, type IEntityFilterSearchDataV2, type IEntityUpdateDto, type IExpenseCreateDto, type IExpenseEntity, type IExpenseHeadCreateDto, type IExpenseHeadEntity, type IExpenseHeadHistoryEntity, type IExpenseHeadSearchDto, type IExpenseHeadUpdateDto, type IExpenseHistoryEntity, type IExpenseSearchDto, type IExpenseUpdateDto, type IFlatCreateDto, type IFlatEntity, type IFlatHistoryEntity, type IFlatSearchDto, type IFlatUpdateDto, type IMappingPropertyEntry, type IModelRelationConfig, type ISearchV2Response, type ISponsorCreateDto, type ISponsorEntity, type ISponsorHistoryEntity, type ISponsorSearchDto, type ISponsorUpdateDto, type ITransactionCreateDto, type ITransactionEntity, type ITransactionHistoryEntity, type ITransactionSearchDto, type ITransactionUpdateDto, type IUserCreateDto, type IUserEntity, type IUserHistoryEntity, type IUserSearchDto, type IUserUpdateDto, type IVendorCreateDto, type IVendorEntity, type IVendorHistoryEntity, type IVendorSearchDto, type IVendorUpdateDto, NotFoundException, type Nullable, OrderByDirection, PAYMENT_OPTIONS, PaymentType, ReferenceIdPrefix, RelationType, SHOP_UNIT_NUMBER_PATTERN, SHOP_WING, SPECIAL_FLATS, SPECIAL_FLAT_LABELS, SponsorHistoryModel, SponsorModel, SponsorTier, TransactionEntityType, TransactionHistoryModel, TransactionModel, TransactionType, USER_RELATION_CONFIG, UnauthorizedException, type UserExpenseReport, type UserExpenseReportTotals, type UserExpenseRow, UserHistoryModel, UserModel, VendorHistoryModel, VendorModel, VendorType, WINGS, WING_ALPHABETS, type WingCollectionDonationByIdLike, type WingCollectionDonationLike, type WingCollectionReport, type WingCollectionRow, type WingCollectionTotals, type XlsxCellAddress, type XlsxMergeRange, type XlsxSerializationType, type XlsxSheetInput, type XlsxSheetOptions, buildUserExpenseReport, buildUserExpenseWorkbook, buildWingWiseCollectionReport, buildWingWiseCollectionReportByFlatId, buildWingWiseCollectionWorkbook, buildXlsxWorkbook, convertNumberToWords, definedValues, diffArrays, entityListEntityModelMap, epochToReadableDate, getFlatValidationErrors, getObjectDiffingKeys, getWingSelectionLabel, getWingSelectionSlug, groupBy, isSpecialFlatLabel, isValidFlatWing, roundToTwoDecimals, serializeXlsx, validateFlatOrThrow };

package/dist/index.d.ts

@@ -918,6 +918,26 @@ type FlatScopeRow = {
 declare function getWingSelectionLabel(selection: string, specials?: readonly string[]): string;
 declare function getWingSelectionSlug(selection: string, specials?: readonly string[]): string;
 declare function buildWingWiseCollectionReport(donations: WingCollectionDonationLike[], year: number, selection: string, flats?: readonly FlatScopeRow[]): WingCollectionReport;
+/** Donation shape matched by flat entity id (flatId-only reads). */
+interface WingCollectionDonationByIdLike {
+    flatId?: Nullable<number>;
+    amount: number;
+    receiptNumber?: string;
+    paymentType?: string;
+    createdOn?: number;
+}
+type FlatIdScopeRow = {
+    id: number;
+    wing?: string | null;
+    unitNumber: string;
+};
+/**
+ * flatId-keyed variant of buildWingWiseCollectionReport — donations are
+ * grouped by their flat ENTITY id and labels derive from the flat itself.
+ * Donations without a resolvable flat are silently excluded. The flats list
+ * is required (ids cannot be inferred from statics).
+ */
+declare function buildWingWiseCollectionReportByFlatId(donations: WingCollectionDonationByIdLike[], year: number, selection: string, flats: readonly FlatIdScopeRow[]): WingCollectionReport;
 declare function buildWingWiseCollectionWorkbook(report: WingCollectionReport): XLSX.WorkBook;
 
 type XlsxSerializationType = 'base64' | 'array' | 'binary';
@@ -1127,4 +1147,4 @@ declare function isSpecialFlatLabel(label: string): boolean;
 declare function getFlatValidationErrors(input: Partial<IFlatEntity>): FlatValidationError[];
 declare function validateFlatOrThrow(input: Partial<IFlatEntity>): void;
 
-export { ALL_WINGS_SELECTION, BadRequestException, BaseEntityModel, ConfigurationKey, ConfigurationModel, ConfigurationType, DateCodeUtils, DateUtil, DonationHistoryModel, DonationModel, EntityFilterDataHelper, EntityHistoryOperation, EntityList, type EntityListEntityModelMap, type EntityModelType, EntityStatus, type EntityType, ExpenseHeadHistoryModel, ExpenseHeadModel, ExpenseHistoryModel, ExpenseModel, FLATS_BY_WING, FLAT_DONATION_RELATION_CONFIG, FLAT_NUMBERS, FLAT_UNIT_NUMBER_PATTERN, FLAT_WING_PATTERN, type FlatCollectionEntry, type FlatCollectionStatus, type FlatDonationLike, FlatHistoryModel, type FlatIdDonationLike, FlatModel, type FlatOption, type FlatParseResult, type FlatValidationError, ForbiddenException, HttpException, type IAuditColumnEntity, type IBaseHistoryEntity, type ICashBookEntry, type IConfigurationCreateDto, type IConfigurationEntity, type IConfigurationSearchDto, type IConfigurationUpdateDto, type IDonationCreateDto, type IDonationEntity, type IDonationHistoryEntity, type IDonationSearchDto, type IDonationUpdateDto, type IDtoValidationError, type IEntityCreateDto, type IEntityFilterData, type IEntityFilterSearchData, type IEntityFilterSearchDataV2, type IEntityUpdateDto, type IExpenseCreateDto, type IExpenseEntity, type IExpenseHeadCreateDto, type IExpenseHeadEntity, type IExpenseHeadHistoryEntity, type IExpenseHeadSearchDto, type IExpenseHeadUpdateDto, type IExpenseHistoryEntity, type IExpenseSearchDto, type IExpenseUpdateDto, type IFlatCreateDto, type IFlatEntity, type IFlatHistoryEntity, type IFlatSearchDto, type IFlatUpdateDto, type IMappingPropertyEntry, type IModelRelationConfig, type ISearchV2Response, type ISponsorCreateDto, type ISponsorEntity, type ISponsorHistoryEntity, type ISponsorSearchDto, type ISponsorUpdateDto, type ITransactionCreateDto, type ITransactionEntity, type ITransactionHistoryEntity, type ITransactionSearchDto, type ITransactionUpdateDto, type IUserCreateDto, type IUserEntity, type IUserHistoryEntity, type IUserSearchDto, type IUserUpdateDto, type IVendorCreateDto, type IVendorEntity, type IVendorHistoryEntity, type IVendorSearchDto, type IVendorUpdateDto, NotFoundException, type Nullable, OrderByDirection, PAYMENT_OPTIONS, PaymentType, ReferenceIdPrefix, RelationType, SHOP_UNIT_NUMBER_PATTERN, SHOP_WING, SPECIAL_FLATS, SPECIAL_FLAT_LABELS, SponsorHistoryModel, SponsorModel, SponsorTier, TransactionEntityType, TransactionHistoryModel, TransactionModel, TransactionType, USER_RELATION_CONFIG, UnauthorizedException, type UserExpenseReport, type UserExpenseReportTotals, type UserExpenseRow, UserHistoryModel, UserModel, VendorHistoryModel, VendorModel, VendorType, WINGS, WING_ALPHABETS, type WingCollectionDonationLike, type WingCollectionReport, type WingCollectionRow, type WingCollectionTotals, type XlsxCellAddress, type XlsxMergeRange, type XlsxSerializationType, type XlsxSheetInput, type XlsxSheetOptions, buildUserExpenseReport, buildUserExpenseWorkbook, buildWingWiseCollectionReport, buildWingWiseCollectionWorkbook, buildXlsxWorkbook, convertNumberToWords, definedValues, diffArrays, entityListEntityModelMap, epochToReadableDate, getFlatValidationErrors, getObjectDiffingKeys, getWingSelectionLabel, getWingSelectionSlug, groupBy, isSpecialFlatLabel, isValidFlatWing, roundToTwoDecimals, serializeXlsx, validateFlatOrThrow };
+export { ALL_WINGS_SELECTION, BadRequestException, BaseEntityModel, ConfigurationKey, ConfigurationModel, ConfigurationType, DateCodeUtils, DateUtil, DonationHistoryModel, DonationModel, EntityFilterDataHelper, EntityHistoryOperation, EntityList, type EntityListEntityModelMap, type EntityModelType, EntityStatus, type EntityType, ExpenseHeadHistoryModel, ExpenseHeadModel, ExpenseHistoryModel, ExpenseModel, FLATS_BY_WING, FLAT_DONATION_RELATION_CONFIG, FLAT_NUMBERS, FLAT_UNIT_NUMBER_PATTERN, FLAT_WING_PATTERN, type FlatCollectionEntry, type FlatCollectionStatus, type FlatDonationLike, FlatHistoryModel, type FlatIdDonationLike, FlatModel, type FlatOption, type FlatParseResult, type FlatValidationError, ForbiddenException, HttpException, type IAuditColumnEntity, type IBaseHistoryEntity, type ICashBookEntry, type IConfigurationCreateDto, type IConfigurationEntity, type IConfigurationSearchDto, type IConfigurationUpdateDto, type IDonationCreateDto, type IDonationEntity, type IDonationHistoryEntity, type IDonationSearchDto, type IDonationUpdateDto, type IDtoValidationError, type IEntityCreateDto, type IEntityFilterData, type IEntityFilterSearchData, type IEntityFilterSearchDataV2, type IEntityUpdateDto, type IExpenseCreateDto, type IExpenseEntity, type IExpenseHeadCreateDto, type IExpenseHeadEntity, type IExpenseHeadHistoryEntity, type IExpenseHeadSearchDto, type IExpenseHeadUpdateDto, type IExpenseHistoryEntity, type IExpenseSearchDto, type IExpenseUpdateDto, type IFlatCreateDto, type IFlatEntity, type IFlatHistoryEntity, type IFlatSearchDto, type IFlatUpdateDto, type IMappingPropertyEntry, type IModelRelationConfig, type ISearchV2Response, type ISponsorCreateDto, type ISponsorEntity, type ISponsorHistoryEntity, type ISponsorSearchDto, type ISponsorUpdateDto, type ITransactionCreateDto, type ITransactionEntity, type ITransactionHistoryEntity, type ITransactionSearchDto, type ITransactionUpdateDto, type IUserCreateDto, type IUserEntity, type IUserHistoryEntity, type IUserSearchDto, type IUserUpdateDto, type IVendorCreateDto, type IVendorEntity, type IVendorHistoryEntity, type IVendorSearchDto, type IVendorUpdateDto, NotFoundException, type Nullable, OrderByDirection, PAYMENT_OPTIONS, PaymentType, ReferenceIdPrefix, RelationType, SHOP_UNIT_NUMBER_PATTERN, SHOP_WING, SPECIAL_FLATS, SPECIAL_FLAT_LABELS, SponsorHistoryModel, SponsorModel, SponsorTier, TransactionEntityType, TransactionHistoryModel, TransactionModel, TransactionType, USER_RELATION_CONFIG, UnauthorizedException, type UserExpenseReport, type UserExpenseReportTotals, type UserExpenseRow, UserHistoryModel, UserModel, VendorHistoryModel, VendorModel, VendorType, WINGS, WING_ALPHABETS, type WingCollectionDonationByIdLike, type WingCollectionDonationLike, type WingCollectionReport, type WingCollectionRow, type WingCollectionTotals, type XlsxCellAddress, type XlsxMergeRange, type XlsxSerializationType, type XlsxSheetInput, type XlsxSheetOptions, buildUserExpenseReport, buildUserExpenseWorkbook, buildWingWiseCollectionReport, buildWingWiseCollectionReportByFlatId, buildWingWiseCollectionWorkbook, buildXlsxWorkbook, convertNumberToWords, definedValues, diffArrays, entityListEntityModelMap, epochToReadableDate, getFlatValidationErrors, getObjectDiffingKeys, getWingSelectionLabel, getWingSelectionSlug, groupBy, isSpecialFlatLabel, isValidFlatWing, roundToTwoDecimals, serializeXlsx, validateFlatOrThrow };

package/dist/index.js

@@ -86,6 +86,7 @@ __export(index_exports, {
   buildUserExpenseReport: () => buildUserExpenseReport,
   buildUserExpenseWorkbook: () => buildUserExpenseWorkbook,
   buildWingWiseCollectionReport: () => buildWingWiseCollectionReport,
+  buildWingWiseCollectionReportByFlatId: () => buildWingWiseCollectionReportByFlatId,
   buildWingWiseCollectionWorkbook: () => buildWingWiseCollectionWorkbook,
   buildXlsxWorkbook: () => buildXlsxWorkbook,
   convertNumberToWords: () => convertNumberToWords,
@@ -1918,7 +1919,8 @@ function resolveScopeSpecials(flats) {
 }
 function getWingSelectionLabel(selection, specials) {
   if (selection === ALL_WINGS_SELECTION) return "All Wings";
-  if ((specials ?? FlatModel.SPECIAL_FLATS).includes(selection)) return selection;
+  if ((specials ?? FlatModel.SPECIAL_FLATS).includes(selection))
+    return selection;
   return `Wing ${selection}`;
 }
 function getWingSelectionSlug(selection, specials) {
@@ -1955,27 +1957,29 @@ function buildWingWiseCollectionReport(donations, year, selection, flats) {
     donationsByFlat.set(d.flatNo, list);
   }
   const scope = getFlatNumbersInScope(selection, flats);
-  const rows = scope.map(
-    (flatNo) => {
-      const flatDonations = donationsByFlat.get(flatNo) ?? [];
-      const amount = flatDonations.reduce((sum, d) => sum + d.amount, 0);
-      const latest = flatDonations.reduce(
-        (acc, d) => !acc || (d.createdOn ?? 0) > (acc.createdOn ?? 0) ? d : acc,
-        null
-      );
-      return {
-        flatNo,
-        status: amount > 0 ? "Paid" : "Pending",
-        amount,
-        count: flatDonations.length,
-        receiptNumber: latest?.receiptNumber ?? "",
-        paymentType: latest?.paymentType ?? "",
-        donationDate: latest?.createdOn ? epochToReadableDate(latest.createdOn, "short") : ""
-      };
-    }
-  );
+  const rows = scope.map((flatNo) => {
+    const flatDonations = donationsByFlat.get(flatNo) ?? [];
+    const amount = flatDonations.reduce((sum, d) => sum + d.amount, 0);
+    const latest = flatDonations.reduce(
+      (acc, d) => !acc || (d.createdOn ?? 0) > (acc.createdOn ?? 0) ? d : acc,
+      null
+    );
+    return {
+      flatNo,
+      status: amount > 0 ? "Paid" : "Pending",
+      amount,
+      count: flatDonations.length,
+      receiptNumber: latest?.receiptNumber ?? "",
+      paymentType: latest?.paymentType ?? "",
+      donationDate: latest?.createdOn ? epochToReadableDate(latest.createdOn, "short") : ""
+    };
+  });
   rows.sort(
-    (a, b) => FlatModel.compareFlatNumbers(a.flatNo, b.flatNo, resolveScopeSpecials(flats))
+    (a, b) => FlatModel.compareFlatNumbers(
+      a.flatNo,
+      b.flatNo,
+      resolveScopeSpecials(flats)
+    )
   );
   const totals = rows.reduce(
     (acc, r) => ({
@@ -1987,7 +1991,15 @@ function buildWingWiseCollectionReport(donations, year, selection, flats) {
       upi: acc.upi,
       bankTransfer: acc.bankTransfer
     }),
-    { flats: 0, paid: 0, pending: 0, amount: 0, cash: 0, upi: 0, bankTransfer: 0 }
+    {
+      flats: 0,
+      paid: 0,
+      pending: 0,
+      amount: 0,
+      cash: 0,
+      upi: 0,
+      bankTransfer: 0
+    }
   );
   for (const [flatNo, flatDonations] of donationsByFlat) {
     if (!scope.includes(flatNo)) continue;
@@ -2003,6 +2015,66 @@ function buildWingWiseCollectionReport(donations, year, selection, flats) {
   }
   return { year, selection, label, rows, totals };
 }
+function buildWingWiseCollectionReportByFlatId(donations, year, selection, flats) {
+  const specials = FlatModel.getSpecialsFromFlats(flats);
+  const label = getWingSelectionLabel(selection, specials);
+  const scopeFlats = selection === ALL_WINGS_SELECTION ? [...flats] : specials.includes(selection) ? flats.filter((f) => !f.wing && f.unitNumber === selection) : flats.filter((f) => f.wing === selection);
+  const scopeIds = new Set(scopeFlats.map((f) => f.id));
+  const scopedDonations = donations.filter(
+    (d) => d.flatId != null && scopeIds.has(d.flatId)
+  );
+  const rows = scopeFlats.map((flat) => {
+    const flatNo = FlatModel.getFlatLabel(flat);
+    const flatDonations = scopedDonations.filter((d) => d.flatId === flat.id);
+    const amount = flatDonations.reduce((sum, d) => sum + d.amount, 0);
+    const latest = flatDonations.reduce(
+      (acc, d) => !acc || (d.createdOn ?? 0) > (acc.createdOn ?? 0) ? d : acc,
+      null
+    );
+    return {
+      flatNo,
+      status: amount > 0 ? "Paid" : "Pending",
+      amount,
+      count: flatDonations.length,
+      receiptNumber: latest?.receiptNumber ?? "",
+      paymentType: latest?.paymentType ?? "",
+      donationDate: latest?.createdOn ? epochToReadableDate(latest.createdOn, "short") : ""
+    };
+  });
+  rows.sort(
+    (a, b) => FlatModel.compareFlatNumbers(a.flatNo, b.flatNo, specials)
+  );
+  const totals = rows.reduce(
+    (acc, r) => ({
+      flats: acc.flats + 1,
+      paid: acc.paid + (r.status === "Paid" ? 1 : 0),
+      pending: acc.pending + (r.status === "Pending" ? 1 : 0),
+      amount: acc.amount + r.amount,
+      cash: acc.cash,
+      upi: acc.upi,
+      bankTransfer: acc.bankTransfer
+    }),
+    {
+      flats: 0,
+      paid: 0,
+      pending: 0,
+      amount: 0,
+      cash: 0,
+      upi: 0,
+      bankTransfer: 0
+    }
+  );
+  for (const d of scopedDonations) {
+    if (d.paymentType === "Cash" /* CASH */) {
+      totals.cash += d.amount;
+    } else if (d.paymentType === "UPI" /* UPI */) {
+      totals.upi += d.amount;
+    } else {
+      totals.bankTransfer += d.amount;
+    }
+  }
+  return { year, selection, label, rows, totals };
+}
 function buildWingWiseCollectionWorkbook(report) {
   const aoa = [
     [
@@ -2297,6 +2369,7 @@ function validateFlatOrThrow(input) {
   buildUserExpenseReport,
   buildUserExpenseWorkbook,
   buildWingWiseCollectionReport,
+  buildWingWiseCollectionReportByFlatId,
   buildWingWiseCollectionWorkbook,
   buildXlsxWorkbook,
   convertNumberToWords,