features/API-65/find-nearest-branch

src/branch/branch.service.ts

@@ -93,4 +93,20 @@ export class BranchService {
     });
     return deleted.affected === 1;
   }
+
+  async findNearestBranch(lat: number, lng: number): Promise<Branch> {
+    const branch = await this.branchRepository
+      .createQueryBuilder('branch')
+      .orderBy(
+        `ST_DistanceSphere(ST_MakePoint(branch.longitude, branch.latitude), ST_MakePoint(:lng, :lat))`,
+      )
+      .setParameters({ lat, lng })
+      .getOne();
+
+    if (!branch) {
+      throw new NotFoundException('No closer branch found');
+    }
+
+    return branch;
+  }
 }

src/database/migrations/1747014730112-enable-postgis-extension-migration.ts

@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class EnablePostgisExtensionMigration1747014730112
+  implements MigrationInterface
+{
+  name = 'EnablePostgisExtensionMigration1747014730112';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`CREATE EXTENSION IF NOT EXISTS postgis`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP EXTENSION IF EXISTS postgis`);
+  }
+}

src/order/order.service.ts

@@ -66,13 +66,15 @@ export class OrderService {
           'User address ID is required for delivery orders',
         );
       }
-      // TODO: Find the closest branch to the address
-      const branches = await this.branchService.findAll(1, 10);
-      branch = branches[0];
       userAddress = await this.userService.getAddress(
         user.id,
         createOrderDTO.userAddressId,
       );
+      const nearestBranch = await this.branchService.findNearestBranch(
+        userAddress.latitude,
+        userAddress.longitude,
+      );
+      branch = nearestBranch;
     } else {
       throw new BadRequestException('Invalid order type');
     }