riccardo/newsletter-hackernews
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: code cleaning (#21)

Browse Source
This commit is contained in:
Riccardo Senica
2024-11-23 09:13:15 +01:00
committed by GitHub
parent c4f03feffe
commit c300b2501d
31 changed files with 903 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/api/confirmation/route.ts
View File

@@ -1,5 +1,5 @@
import prisma from '@prisma/prisma';
import { ApiResponse } from '@utils/apiResponse';
import { formatApiResponse } from '@utils/formatApiResponse';
import {
BAD_REQUEST,
INTERNAL_SERVER_ERROR,
@@ -21,7 +21,7 @@ export async function POST(request: NextRequest) {
const body = await request.json();
const validation = ConfirmationSchema.safeParse(body);
if (!validation.success || !validation.data.code) {
return ApiResponse(STATUS_BAD_REQUEST, BAD_REQUEST);
return formatApiResponse(STATUS_BAD_REQUEST, BAD_REQUEST);
}
const user = await prisma.user.findUnique({
@@ -53,10 +53,13 @@ export async function POST(request: NextRequest) {
message: `Thank you for confirming the subscription, ${user.email}!`
};
return ApiResponse(STATUS_OK, message);
return formatApiResponse(STATUS_OK, message);
}
} catch (error) {
console.error(error);
return ApiResponse(STATUS_INTERNAL_SERVER_ERROR, INTERNAL_SERVER_ERROR);
return formatApiResponse(
STATUS_INTERNAL_SERVER_ERROR,
INTERNAL_SERVER_ERROR
);
}
}

14
app/api/import/route.ts
View File

@@ -1,5 +1,5 @@
import prisma from '@prisma/prisma';
import { ApiResponse } from '@utils/apiResponse';
import { formatApiResponse } from '@utils/formatApiResponse';
import {
INTERNAL_SERVER_ERROR,
STATUS_INTERNAL_SERVER_ERROR,
@@ -15,7 +15,7 @@ export async function GET(request: NextRequest) {
if (
request.headers.get('Authorization') !== `Bearer ${process.env.CRON_SECRET}`
) {
return ApiResponse(STATUS_UNAUTHORIZED, 'Unauthorized');
return formatApiResponse(STATUS_UNAUTHORIZED, 'Unauthorized');
}
try {
@@ -76,9 +76,15 @@ export async function GET(request: NextRequest) {
});
}
return ApiResponse(STATUS_OK, `Imported ${newsPromises.length} news.`);
return formatApiResponse(
STATUS_OK,
`Imported ${newsPromises.length} news.`
);
} catch (error) {
console.error(error);
return ApiResponse(STATUS_INTERNAL_SERVER_ERROR, INTERNAL_SERVER_ERROR);
return formatApiResponse(
STATUS_INTERNAL_SERVER_ERROR,
INTERNAL_SERVER_ERROR
);
}
}

24
app/api/mailing/route.ts
View File

@@ -1,7 +1,7 @@
import NewsletterTemplate from '@components/email/Newsletter';
import { NewsletterTemplate } from '@components/email/Newsletter';
import prisma from '@prisma/prisma';
import { ApiResponse } from '@utils/apiResponse';
import { sender } from '@utils/sender';
import { formatApiResponse } from '@utils/formatApiResponse';
import { sender } from '@utils/resendClient';
import {
INTERNAL_SERVER_ERROR,
STATUS_INTERNAL_SERVER_ERROR,
@@ -17,7 +17,7 @@ export async function GET(request: NextRequest) {
if (
request.headers.get('Authorization') !== `Bearer ${process.env.CRON_SECRET}`
) {
return ApiResponse(STATUS_UNAUTHORIZED, 'Unauthorized');
return formatApiResponse(STATUS_UNAUTHORIZED, 'Unauthorized');
}
if (!process.env.NEWS_TO_USE) {
@@ -52,7 +52,7 @@ export async function GET(request: NextRequest) {
console.info(`Found ${users.length} users to mail to.`);
if (users.length === 0) {
return ApiResponse(STATUS_OK, 'No user to mail to.');
return formatApiResponse(STATUS_OK, 'No user to mail to.');
}
const news = await prisma.news.findMany({
@@ -70,7 +70,7 @@ export async function GET(request: NextRequest) {
console.info(`Found ${news.length} news to include in the newsletter.`);
if (news.length === 0) {
return ApiResponse(STATUS_OK, 'No news to include in newsletter.');
return formatApiResponse(STATUS_OK, 'No news to include in newsletter.');
}
const validRankedNews = news.sort((a, b) => b.score - a.score);
@@ -83,7 +83,10 @@ export async function GET(request: NextRequest) {
);
if (!sent) {
return ApiResponse(STATUS_INTERNAL_SERVER_ERROR, INTERNAL_SERVER_ERROR);
return formatApiResponse(
STATUS_INTERNAL_SERVER_ERROR,
INTERNAL_SERVER_ERROR
);
}
// update users so they don't get the newsletter again
@@ -98,12 +101,15 @@ export async function GET(request: NextRequest) {
}
});
return ApiResponse(
return formatApiResponse(
STATUS_OK,
`Newsletter sent to ${users.length} addresses.`
);
} catch (error) {
console.error(error);
return ApiResponse(STATUS_INTERNAL_SERVER_ERROR, INTERNAL_SERVER_ERROR);
return formatApiResponse(
STATUS_INTERNAL_SERVER_ERROR,
INTERNAL_SERVER_ERROR
);
}
}

9
app/api/news/route.ts
View File

@@ -1,5 +1,5 @@
import prisma from '@prisma/prisma';
import { ApiResponse } from '@utils/apiResponse';
import { formatApiResponse } from '@utils/formatApiResponse';
import {
INTERNAL_SERVER_ERROR,
STATUS_INTERNAL_SERVER_ERROR,
@@ -21,10 +21,13 @@ export async function GET() {
});
if (news) {
return ApiResponse(STATUS_OK, news);
return formatApiResponse(STATUS_OK, news);
}
} catch (error) {
console.error(error);
return ApiResponse(STATUS_INTERNAL_SERVER_ERROR, INTERNAL_SERVER_ERROR);
return formatApiResponse(
STATUS_INTERNAL_SERVER_ERROR,
INTERNAL_SERVER_ERROR
);
}
}

22
app/api/subscribe/route.ts
View File

@@ -1,7 +1,7 @@
import ConfirmationTemplate from '@components/email/Confirmation';
import { ConfirmationTemplate } from '@components/email/Confirmation';
import prisma from '@prisma/prisma';
import { ApiResponse } from '@utils/apiResponse';
import { sender } from '@utils/sender';
import { formatApiResponse } from '@utils/formatApiResponse';
import { sender } from '@utils/resendClient';
import {
BAD_REQUEST,
INTERNAL_SERVER_ERROR,
@@ -25,7 +25,7 @@ export async function POST(request: NextRequest) {
const validation = SubscribeFormSchema.safeParse(body);
if (!validation.success) {
return ApiResponse(STATUS_BAD_REQUEST, BAD_REQUEST);
return formatApiResponse(STATUS_BAD_REQUEST, BAD_REQUEST);
}
const { email } = validation.data;
@@ -73,7 +73,7 @@ export async function POST(request: NextRequest) {
message: `Thank you for subscribing!`
};
return ApiResponse(STATUS_OK, message);
return formatApiResponse(STATUS_OK, message);
} else if (user && !user.confirmed) {
await prisma.user.update({
where: {
@@ -106,7 +106,10 @@ export async function POST(request: NextRequest) {
const sent = await sender([email], ConfirmationTemplate(code));
if (!sent) {
return ApiResponse(STATUS_INTERNAL_SERVER_ERROR, INTERNAL_SERVER_ERROR);
return formatApiResponse(
STATUS_INTERNAL_SERVER_ERROR,
INTERNAL_SERVER_ERROR
);
}
const message: ResponseType = {
@@ -114,9 +117,12 @@ export async function POST(request: NextRequest) {
message: `Thank you! You will now receive an email to ${email} to confirm the subscription.`
};
return ApiResponse(STATUS_OK, message);
return formatApiResponse(STATUS_OK, message);
} catch (error) {
console.error(error);
return ApiResponse(STATUS_INTERNAL_SERVER_ERROR, INTERNAL_SERVER_ERROR);
return formatApiResponse(
STATUS_INTERNAL_SERVER_ERROR,
INTERNAL_SERVER_ERROR
);
}
}

17
app/api/unsubscribe/route.ts
View File

@@ -1,7 +1,7 @@
import UnsubscribeTemplate from '@components/email/Unsubscribe';
import { UnsubscribeTemplate } from '@components/email/Unsubscribe';
import prisma from '@prisma/prisma';
import { ApiResponse } from '@utils/apiResponse';
import { sender } from '@utils/sender';
import { formatApiResponse } from '@utils/formatApiResponse';
import { sender } from '@utils/resendClient';
import {
BAD_REQUEST,
INTERNAL_SERVER_ERROR,
@@ -23,7 +23,7 @@ export async function POST(request: NextRequest) {
const body = await request.json();
const validation = UnsubscribeFormSchema.safeParse(body);
if (!validation.success) {
return ApiResponse(STATUS_BAD_REQUEST, BAD_REQUEST);
return formatApiResponse(STATUS_BAD_REQUEST, BAD_REQUEST);
}
const { email } = validation.data;
@@ -55,7 +55,7 @@ export async function POST(request: NextRequest) {
const sent = await sender([email], UnsubscribeTemplate());
if (!sent) {
return ApiResponse(
return formatApiResponse(
STATUS_INTERNAL_SERVER_ERROR,
'Internal server error'
);
@@ -67,9 +67,12 @@ export async function POST(request: NextRequest) {
message: `${email} unsubscribed.`
};
return ApiResponse(STATUS_OK, message);
return formatApiResponse(STATUS_OK, message);
} catch (error) {
console.error(error);
return ApiResponse(STATUS_INTERNAL_SERVER_ERROR, INTERNAL_SERVER_ERROR);
return formatApiResponse(
STATUS_INTERNAL_SERVER_ERROR,
INTERNAL_SERVER_ERROR
);
}
}