chore: some refactor and cleaning

app/api/confirmation/route.ts

@@ -9,13 +9,12 @@ import {
 } from '@utils/statusCodes';
 import { ConfirmationSchema, ResponseType } from '@utils/validationSchemas';
 import { NextRequest } from 'next/server';
-import { Resend } from 'resend';
 
 export const dynamic = 'force-dynamic'; // defaults to force-static
 
 export async function POST(request: NextRequest) {
   try {
-    if (!process.env.RESEND_KEY || !process.env.RESEND_AUDIENCE) {
+    if (!process.env.RESEND_KEY) {
       throw new Error('Resend variables not set');
     }
     const body = await request.json();
@@ -31,14 +30,6 @@ export async function POST(request: NextRequest) {
     });
 
     if (user) {
-      const resend = new Resend(process.env.RESEND_KEY);
-
-      await resend.contacts.update({
-        id: user.resendId,
-        audienceId: process.env.RESEND_AUDIENCE,
-        unsubscribed: false
-      });
-
       await prisma.user.update({
         where: {
           code: validation.data.code

app/api/import/route.ts

@@ -1,4 +1,5 @@
 import prisma from '@prisma/prisma';
+import axios from 'axios';
 import { formatApiResponse } from '@utils/formatApiResponse';
 import {
   INTERNAL_SERVER_ERROR,
@@ -19,17 +20,22 @@ export async function GET(request: NextRequest) {
   }
 
   try {
-    const topStories: number[] = await fetch(getTopNews, {
-      cache: 'no-store'
-    }).then(res => res.json());
+    const { data: topStories } = await axios.get<number[]>(getTopNews, {
+      headers: {
+        'Cache-Control': 'no-store'
+      }
+    });
 
     console.info(`Top stories ids: ${topStories}`);
 
     const newsPromises = topStories
       .slice(0, Number(process.env.NEWS_LIMIT))
-      .map(id => fetch(getSingleNews(id)).then(res => res.json()));
+      .map(id => axios.get<NewsDatabaseType>(getSingleNews(id)));
 
-    const news: NewsDatabaseType[] = await Promise.all(newsPromises);
+    const newsResponses = await Promise.all(newsPromises);
+    const news: NewsDatabaseType[] = newsResponses.map(
+      response => response.data
+    );
 
     const upsertPromises = news.map(async getSingleNews => {
       const validation = NewsDatabaseSchema.safeParse(getSingleNews);
@@ -81,7 +87,11 @@ export async function GET(request: NextRequest) {
       `Imported ${newsPromises.length} news.`
     );
   } catch (error) {
-    console.error(error);
+    if (axios.isAxiosError(error)) {
+      console.error('Axios error:', error.response?.data || error.message);
+    } else {
+      console.error('Error:', error);
+    }
     return formatApiResponse(
       STATUS_INTERNAL_SERVER_ERROR,
       INTERNAL_SERVER_ERROR

app/api/mailing/route.ts

@@ -25,9 +25,6 @@ export async function GET(request: NextRequest) {
   }
 
   try {
-    // send newsletter to users who didn't get it in the last 23h 50m, assuming a cron job every 10 minutes
-    // this is to avoid sending the newsletter to the same users multiple times
-    // this is not a perfect solution, but it's good enough for now
     const users = await prisma.user.findMany({
       where: {
         confirmed: true,

app/api/subscribe/route.ts

@@ -12,11 +12,10 @@ import {
 import { ResponseType, SubscribeFormSchema } from '@utils/validationSchemas';
 import * as crypto from 'crypto';
 import { NextRequest } from 'next/server';
-import { Resend } from 'resend';
 
 export async function POST(request: NextRequest) {
   try {
-    if (!process.env.RESEND_KEY || !process.env.RESEND_AUDIENCE) {
+    if (!process.env.RESEND_KEY) {
       throw new Error('RESEND_KEY is not set');
     }
 
@@ -36,8 +35,6 @@ export async function POST(request: NextRequest) {
       }
     });
 
-    const resend = new Resend(process.env.RESEND_KEY);
-
     const code = crypto
       .createHash('sha256')
       .update(`${process.env.SECRET_HASH}${email}}`)
@@ -53,19 +50,6 @@ export async function POST(request: NextRequest) {
             deleted: false
           }
         });
-
-        const contact = await resend.contacts.get({
-          id: user.resendId,
-          audienceId: process.env.RESEND_AUDIENCE
-        });
-
-        if (!contact) {
-          await resend.contacts.update({
-            id: user.resendId,
-            audienceId: process.env.RESEND_AUDIENCE,
-            unsubscribed: true
-          });
-        }
       }
 
       const message: ResponseType = {
@@ -84,21 +68,10 @@ export async function POST(request: NextRequest) {
         }
       });
     } else {
-      const contact = await resend.contacts.create({
-        email: email,
-        audienceId: process.env.RESEND_AUDIENCE,
-        unsubscribed: true
-      });
-
-      if (!contact.data?.id) {
-        throw new Error('Failed to create Resend contact');
-      }
-
       await prisma.user.create({
         data: {
           email,
-          code,
-          resendId: contact.data.id
+          code
         }
       });
     }

app/api/unsubscribe/route.ts

@@ -11,14 +11,11 @@ import {
 } from '@utils/statusCodes';
 import { ResponseType, UnsubscribeFormSchema } from '@utils/validationSchemas';
 import { NextRequest } from 'next/server';
-import { Resend } from 'resend';
-
-export const dynamic = 'force-dynamic'; // defaults to force-static
 
 export async function POST(request: NextRequest) {
   try {
-    if (!process.env.RESEND_KEY || !process.env.RESEND_AUDIENCE) {
-      throw new Error('RESEND_AUDIENCE is not set');
+    if (!process.env.RESEND_KEY) {
+      throw new Error('Resend variables not set');
     }
     const body = await request.json();
     const validation = UnsubscribeFormSchema.safeParse(body);
@@ -44,14 +41,6 @@ export async function POST(request: NextRequest) {
         }
       });
 
-      const resend = new Resend(process.env.RESEND_KEY);
-
-      await resend.contacts.update({
-        id: user.resendId,
-        audienceId: process.env.RESEND_AUDIENCE,
-        unsubscribed: true
-      });
-
       const sent = await sender([email], UnsubscribeTemplate());
 
       if (!sent) {