Skip to content

fix: split forms by month #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxakuru merged 1 commit into from
Mar 10, 2026
Merged

fix: split forms by month #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions src/actions/processor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,23 @@ export async function main(params) {
folderPath = `/incoming/deadletter/${formId}`;
}

// sheets are named by year
const year = new Date().getFullYear();
const sheetPath = `${folderPath}/${year}.json`;
const now = new Date();
const year = now.getFullYear();
const month = String(now.getMonth() + 1).padStart(2, '0');
const sheetPath = `${folderPath}/${year}/${month}.json`;
log.info(`processing submission for formId=${formId} to sheet=${sheetPath}`);

// if entries contains the destination sheet, append to it, otherwise create a new sheet
const sheetExists = !!entries.find((entry) => entry.path === `/${ctx.env.ORG}/${ctx.env.SITE}${sheetPath}`);
// check if the month sheet exists inside the year subfolder
let sheetExists = false;
const yearFolderExists = entries.some(
(entry) => entry.path === `/${ctx.env.ORG}/${ctx.env.SITE}${folderPath}/${year}`
);
if (yearFolderExists) {
const yearEntries = await listFolder(ctx, `${folderPath}/${year}`);
sheetExists = yearEntries.some(
(entry) => entry.path === `/${ctx.env.ORG}/${ctx.env.SITE}${sheetPath}`
);
}

/** @type {Sheet} */
let sheet;
Expand Down
156 changes: 137 additions & 19 deletions test/processor.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ jest.unstable_mockModule('../src/emails.js', () => ({

const { main } = await import('../src/actions/processor/index.js');

const YEAR = new Date().getFullYear();
const NOW = new Date();
const YEAR = NOW.getFullYear();
const MONTH = String(NOW.getMonth() + 1).padStart(2, '0');

function makeCtx(overrides = {}) {
return {
Expand All @@ -45,16 +47,16 @@ function makeCtx(overrides = {}) {
function makeEntries({ sheetExists = true, emailTemplate = false } = {}) {
const entries = [];
entries.push({
path: '/test-org/test-site/incoming/contact-us/2024.json',
name: '2024.json',
ext: 'json',
path: '/test-org/test-site/incoming/contact-us/2024',
name: '2024',
ext: '',
lastModified: 0,
});
if (sheetExists) {
entries.push({
path: `/test-org/test-site/incoming/contact-us/${YEAR}.json`,
name: `${YEAR}.json`,
ext: 'json',
path: `/test-org/test-site/incoming/contact-us/${YEAR}`,
name: `${YEAR}`,
ext: '',
lastModified: 0,
});
}
Expand All @@ -69,6 +71,19 @@ function makeEntries({ sheetExists = true, emailTemplate = false } = {}) {
return entries;
}

function makeYearEntries({ sheetExists = true } = {}) {
const entries = [];
if (sheetExists) {
entries.push({
path: `/test-org/test-site/incoming/contact-us/${YEAR}/${MONTH}.json`,
name: `${MONTH}.json`,
ext: 'json',
lastModified: 0,
});
}
return entries;
}

function makeExistingSheet(records = []) {
return {
':private': {
Expand Down Expand Up @@ -125,14 +140,17 @@ describe('processor action', () => {
test('accepts event data nested under ctx.data.data', async () => {
const ctx = makeCtx();
mockMakeContext.mockResolvedValue(ctx);
mockListFolder.mockResolvedValue(makeEntries());
mockListFolder
.mockResolvedValueOnce(makeEntries())
.mockResolvedValueOnce(makeYearEntries());
mockFetchSheet.mockResolvedValue(makeExistingSheet([
{ timestamp: '', IP: '', name: '', email: '' },
]));

const result = await main({});
expect(result.statusCode).toBe(200);
expect(mockListFolder).toHaveBeenCalledWith(ctx, '/incoming/contact-us');
expect(mockListFolder).toHaveBeenCalledWith(ctx, `/incoming/contact-us/${YEAR}`);
});
});

Expand All @@ -142,7 +160,9 @@ describe('processor action', () => {
test('fetches existing sheet and appends record', async () => {
const ctx = makeCtx();
mockMakeContext.mockResolvedValue(ctx);
mockListFolder.mockResolvedValue(makeEntries());
mockListFolder
.mockResolvedValueOnce(makeEntries())
.mockResolvedValueOnce(makeYearEntries());

const existingSheet = makeExistingSheet([
{ timestamp: '2024-01-01', IP: '0.0.0.0', name: 'Jane', email: 'jane@test.com' },
Expand All @@ -152,10 +172,10 @@ describe('processor action', () => {
const result = await main({});

expect(result.statusCode).toBe(200);
expect(mockFetchSheet).toHaveBeenCalledWith(ctx, `/incoming/contact-us/${YEAR}.json`);
expect(mockFetchSheet).toHaveBeenCalledWith(ctx, `/incoming/contact-us/${YEAR}/${MONTH}.json`);
expect(mockUpdateSheet).toHaveBeenCalledWith(
ctx,
`/incoming/contact-us/${YEAR}.json`,
`/incoming/contact-us/${YEAR}/${MONTH}.json`,
expect.objectContaining({
':private': expect.objectContaining({
'private-data': expect.objectContaining({
Expand All @@ -172,7 +192,9 @@ describe('processor action', () => {

test('preserves key order from first record (header row)', async () => {
mockMakeContext.mockResolvedValue(makeCtx());
mockListFolder.mockResolvedValue(makeEntries());
mockListFolder
.mockResolvedValueOnce(makeEntries())
.mockResolvedValueOnce(makeYearEntries());

const existingSheet = makeExistingSheet([
{ timestamp: '2024-01-01', IP: '0.0.0.0', name: 'Jane', email: 'jane@test.com' },
Expand All @@ -197,7 +219,9 @@ describe('processor action', () => {
},
});
mockMakeContext.mockResolvedValue(ctx);
mockListFolder.mockResolvedValue(makeEntries());
mockListFolder
.mockResolvedValueOnce(makeEntries())
.mockResolvedValueOnce(makeYearEntries());

const existingSheet = makeExistingSheet([
{ timestamp: '2024-01-01', IP: '0.0.0.0', name: 'Jane', email: 'jane@test.com' },
Expand All @@ -212,7 +236,9 @@ describe('processor action', () => {

test('replaces header row when all values are empty (first submission)', async () => {
mockMakeContext.mockResolvedValue(makeCtx());
mockListFolder.mockResolvedValue(makeEntries());
mockListFolder
.mockResolvedValueOnce(makeEntries())
.mockResolvedValueOnce(makeYearEntries());

const existingSheet = makeExistingSheet([
{ timestamp: '', IP: '', name: '', email: '' },
Expand All @@ -235,7 +261,7 @@ describe('processor action', () => {
expect(result.statusCode).toBe(200);
expect(mockUpdateSheet).toHaveBeenCalledWith(
ctx,
`/incoming/deadletter/contact-us/${YEAR}.json`,
`/incoming/deadletter/contact-us/${YEAR}/${MONTH}.json`,
expect.objectContaining({
':private': expect.objectContaining({
'private-data': expect.objectContaining({
Expand All @@ -246,6 +272,90 @@ describe('processor action', () => {
}),
);
});

test('creates new sheet when year folder does not exist', async () => {
const ctx = makeCtx();
mockMakeContext.mockResolvedValue(ctx);
mockListFolder.mockResolvedValueOnce(makeEntries({ sheetExists: false }));

const result = await main({});
expect(result.statusCode).toBe(200);
expect(mockListFolder).toHaveBeenCalledTimes(1);
expect(mockFetchSheet).not.toHaveBeenCalled();
expect(mockUpdateSheet).toHaveBeenCalledWith(
ctx,
`/incoming/contact-us/${YEAR}/${MONTH}.json`,
expect.objectContaining({
':private': expect.objectContaining({
'private-data': expect.objectContaining({
total: 1,
}),
}),
}),
);
});

test('creates new sheet when year folder exists but month file does not', async () => {
const ctx = makeCtx();
mockMakeContext.mockResolvedValue(ctx);
mockListFolder
.mockResolvedValueOnce(makeEntries())
.mockResolvedValueOnce(makeYearEntries({ sheetExists: false }));

const result = await main({});
expect(result.statusCode).toBe(200);
expect(mockListFolder).toHaveBeenCalledTimes(2);
expect(mockFetchSheet).not.toHaveBeenCalled();
expect(mockUpdateSheet).toHaveBeenCalledWith(
ctx,
`/incoming/contact-us/${YEAR}/${MONTH}.json`,
expect.objectContaining({
':private': expect.objectContaining({
'private-data': expect.objectContaining({
total: 1,
}),
}),
}),
);
});

test('creates new year folder and january sheet on year rollover', async () => {
const newYear = YEAR + 1;
jest.useFakeTimers({ now: new Date(`${newYear}-01-15T12:00:00Z`) });

try {
const ctx = makeCtx();
mockMakeContext.mockResolvedValue(ctx);
// form folder exists with only the previous year
mockListFolder.mockResolvedValueOnce([
{
path: `/test-org/test-site/incoming/contact-us/${YEAR}`,
name: `${YEAR}`,
ext: '',
lastModified: 0,
},
]);

const result = await main({});
expect(result.statusCode).toBe(200);
expect(mockListFolder).toHaveBeenCalledTimes(1);
expect(mockFetchSheet).not.toHaveBeenCalled();
expect(mockUpdateSheet).toHaveBeenCalledWith(
ctx,
`/incoming/contact-us/${newYear}/01.json`,
expect.objectContaining({
':private': expect.objectContaining({
'private-data': expect.objectContaining({
total: 1,
data: [expect.objectContaining({ name: 'John' })],
}),
}),
}),
);
} finally {
jest.useRealTimers();
}
});
});

// -- email notifications -------------------------------------------------
Expand All @@ -254,7 +364,9 @@ describe('processor action', () => {
test('sends email when email-template.html entry exists', async () => {
const ctx = makeCtx();
mockMakeContext.mockResolvedValue(ctx);
mockListFolder.mockResolvedValue(makeEntries({ emailTemplate: true }));
mockListFolder
.mockResolvedValueOnce(makeEntries({ emailTemplate: true }))
.mockResolvedValueOnce(makeYearEntries());
mockFetchSheet.mockResolvedValue(makeExistingSheet([
{ timestamp: '', IP: '', name: '', email: '' },
]));
Expand Down Expand Up @@ -285,7 +397,9 @@ describe('processor action', () => {

test('skips email when no email-template.html entry', async () => {
mockMakeContext.mockResolvedValue(makeCtx());
mockListFolder.mockResolvedValue(makeEntries({ emailTemplate: false }));
mockListFolder
.mockResolvedValueOnce(makeEntries({ emailTemplate: false }))
.mockResolvedValueOnce(makeYearEntries());
mockFetchSheet.mockResolvedValue(makeExistingSheet([
{ timestamp: '', IP: '', name: '', email: '' },
]));
Expand All @@ -298,7 +412,9 @@ describe('processor action', () => {

test('skips sendEmail when resolveEmailTemplate returns null', async () => {
mockMakeContext.mockResolvedValue(makeCtx());
mockListFolder.mockResolvedValue(makeEntries({ emailTemplate: true }));
mockListFolder
.mockResolvedValueOnce(makeEntries({ emailTemplate: true }))
.mockResolvedValueOnce(makeYearEntries());
mockFetchSheet.mockResolvedValue(makeExistingSheet([
{ timestamp: '', IP: '', name: '', email: '' },
]));
Expand Down Expand Up @@ -333,7 +449,9 @@ describe('processor action', () => {

test('returns 500 when updateSheet fails', async () => {
mockMakeContext.mockResolvedValue(makeCtx());
mockListFolder.mockResolvedValue(makeEntries());
mockListFolder
.mockResolvedValueOnce(makeEntries())
.mockResolvedValueOnce(makeYearEntries());
mockFetchSheet.mockResolvedValue(makeExistingSheet([
{ timestamp: '', IP: '', name: '', email: '' },
]));
Expand Down
Loading