Merge pull request #19 from FarmLink-ppp/exceptions-filter

fix: fix error handling

Author: tarek-gritli

src/auth/auth.service.ts

@@ -4,7 +4,6 @@ import {
   ForbiddenException,
   Injectable,
   InternalServerErrorException,
-  NotFoundException,
   UnauthorizedException,
 } from '@nestjs/common';
 import { Response } from 'express';
@@ -194,10 +193,7 @@ export class AuthService {
           'If this email is registered and not verified, a verification email has been sent. Please check your inbox or spam folder.',
       };
     } catch (error) {
-      if (
-        error instanceof NotFoundException ||
-        error instanceof BadRequestException
-      ) {
+      if (error instanceof BadRequestException) {
         throw error;
       }
       throw new InternalServerErrorException(

src/farm/farm.service.ts

@@ -2,7 +2,6 @@ import {
   Injectable,
   NotFoundException,
   ForbiddenException,
-  InternalServerErrorException,
 } from '@nestjs/common';
 import { PrismaService } from './../prisma/prisma.service';
 import { CreateFarmDto } from './dto/create-farm.dto';
@@ -12,73 +11,50 @@ export class FarmService {
   constructor(private prisma: PrismaService) {}
 
   async createFarm(createFarmDto: CreateFarmDto, userId: number) {
-    try {
-      const existingFarm = await this.prisma.farm.findUnique({
-        where: { user_id: userId },
-      });
+    const existingFarm = await this.prisma.farm.findUnique({
+      where: { user_id: userId },
+    });
 
-      if (existingFarm) {
-        throw new ForbiddenException('User already has a farm');
-      }
-      return await this.prisma.farm.create({
-        data: {
-          name: createFarmDto.name,
-          location: createFarmDto.location,
-          area_unit: createFarmDto.areaUnit,
-          total_area: createFarmDto.totalArea,
-          user: { connect: { id: userId } },
-        },
-      });
-    } catch (error) {
-      if (error instanceof ForbiddenException) throw error;
-      throw new InternalServerErrorException(error, 'Error creating farm');
+    if (existingFarm) {
+      throw new ForbiddenException('User already has a farm');
     }
+    return await this.prisma.farm.create({
+      data: {
+        name: createFarmDto.name,
+        location: createFarmDto.location,
+        area_unit: createFarmDto.areaUnit,
+        total_area: createFarmDto.totalArea,
+        user: { connect: { id: userId } },
+      },
+    });
   }
 
   async getFarmByUserId(userId: number) {
-    try {
-      const farm = await this.prisma.farm.findUnique({
-        where: { user_id: userId },
-      });
-      if (!farm) throw new NotFoundException('Farm not found');
-      return farm;
-    } catch (error) {
-      if (error instanceof NotFoundException) throw error;
-      throw new InternalServerErrorException(
-        error,
-        'Error fetching farm by user ID',
-      );
-    }
+    const farm = await this.prisma.farm.findUnique({
+      where: { user_id: userId },
+    });
+    if (!farm) throw new NotFoundException('Farm not found');
+    return farm;
   }
 
   async update(updateFarmDto: UpdateFarmDto, userId: number) {
-    try {
-      const farm = await this.getFarmByUserId(userId);
+    const farm = await this.getFarmByUserId(userId);
 
-      return await this.prisma.farm.update({
-        where: { user_id: userId },
-        data: {
-          name: updateFarmDto.name ?? farm.name,
-          total_area: updateFarmDto.totalArea ?? farm.total_area,
-          location: updateFarmDto.location ?? farm.location,
-          area_unit: updateFarmDto.areaUnit ?? farm.area_unit,
-        },
-      });
-    } catch (error) {
-      if (error instanceof NotFoundException) throw error;
-      throw new InternalServerErrorException(error, 'Error updating farm');
-    }
+    return await this.prisma.farm.update({
+      where: { user_id: userId },
+      data: {
+        name: updateFarmDto.name ?? farm.name,
+        total_area: updateFarmDto.totalArea ?? farm.total_area,
+        location: updateFarmDto.location ?? farm.location,
+        area_unit: updateFarmDto.areaUnit ?? farm.area_unit,
+      },
+    });
   }
 
   async remove(userId: number) {
-    try {
-      await this.getFarmByUserId(userId);
-      return await this.prisma.farm.delete({
-        where: { user_id: userId },
-      });
-    } catch (error) {
-      if (error instanceof NotFoundException) throw error;
-      throw new InternalServerErrorException(error, 'Error deleting farm');
-    }
+    await this.getFarmByUserId(userId);
+    return await this.prisma.farm.delete({
+      where: { user_id: userId },
+    });
   }
 }