Favorites #19, Social Media Start #53

bizmatch-server/src/listings/business-listing.service.ts

@@ -1,5 +1,5 @@
 import { BadRequestException, Inject, Injectable } from '@nestjs/common';
-import { and, count, eq, gte, ilike, inArray, lte, ne, or, SQL, sql } from 'drizzle-orm';
+import { and, arrayContains, count, eq, gte, ilike, inArray, lte, ne, or, SQL, sql } from 'drizzle-orm';
 import { NodePgDatabase } from 'drizzle-orm/node-postgres';
 import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
 import { Logger } from 'winston';
@@ -186,7 +186,14 @@ export class BusinessListingService {
 
     return listings.map(l => convertDrizzleBusinessToBusiness(l));
   }
-
+  // #### Find Favorites ########################################
+  async findFavoriteListings(user: JwtUser): Promise<BusinessListing[]> {
+    const userFavorites = await this.conn
+      .select()
+      .from(businesses)
+      .where(arrayContains(businesses.favoritesForUser, [user.username]));
+    return userFavorites.map(l => convertDrizzleBusinessToBusiness(l));
+  }
   // #### CREATE ########################################
   async createListing(data: BusinessListing): Promise<BusinessListing> {
     try {
@@ -236,6 +243,15 @@ export class BusinessListingService {
   async deleteListing(id: string): Promise<void> {
     await this.conn.delete(businesses).where(eq(businesses.id, id));
   }
+  // #### DELETE Favorite ###################################
+  async deleteFavorite(id: string, user: JwtUser): Promise<void> {
+    await this.conn
+      .update(businesses)
+      .set({
+        favoritesForUser: sql`array_remove(${businesses.favoritesForUser}, ${user.username})`,
+      })
+      .where(sql`${businesses.id} = ${id}`);
+  }
   // ##############################################################
   // States
   // ##############################################################

bizmatch-server/src/listings/business-listings.controller.ts

@@ -1,8 +1,9 @@
 import { Body, Controller, Delete, Get, Inject, Param, Post, Put, Request, UseGuards } from '@nestjs/common';
 import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
-import { BusinessListing } from 'src/models/db.model.js';
 import { Logger } from 'winston';
+import { JwtAuthGuard } from '../jwt-auth/jwt-auth.guard.js';
 import { OptionalJwtAuthGuard } from '../jwt-auth/optional-jwt-auth.guard.js';
+import { BusinessListing } from '../models/db.model.js';
 import { BusinessListingCriteria, JwtUser } from '../models/main.model.js';
 import { BusinessListingService } from './business-listing.service.js';
 
@@ -18,7 +19,11 @@ export class BusinessListingsController {
   findById(@Request() req, @Param('id') id: string): any {
     return this.listingsService.findBusinessesById(id, req.user as JwtUser);
   }
-
+  @UseGuards(JwtAuthGuard)
+  @Get('favorites/all')
+  findFavorites(@Request() req): any {
+    return this.listingsService.findFavoriteListings(req.user as JwtUser);
+  }
   @UseGuards(OptionalJwtAuthGuard)
   @Get('user/:userid')
   findByUserId(@Request() req, @Param('userid') userid: string): Promise<BusinessListing[]> {
@@ -54,4 +59,9 @@ export class BusinessListingsController {
   getStates(): any {
     return this.listingsService.getStates();
   }
+  @UseGuards(JwtAuthGuard)
+  @Delete('favorites/:id')
+  deleteFavorite(@Request() req, @Param('id') id: string) {
+    this.listingsService.deleteFavorite(id, req.user as JwtUser);
+  }
 }

bizmatch-server/src/listings/commercial-property-listings.controller.ts

@@ -2,6 +2,7 @@ import { Body, Controller, Delete, Get, Inject, Param, Post, Put, Request, UseGu
 import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
 import { Logger } from 'winston';
 import { FileService } from '../file/file.service.js';
+import { JwtAuthGuard } from '../jwt-auth/jwt-auth.guard.js';
 import { OptionalJwtAuthGuard } from '../jwt-auth/optional-jwt-auth.guard.js';
 import { CommercialPropertyListing } from '../models/db.model';
 import { CommercialPropertyListingCriteria, JwtUser } from '../models/main.model.js';
@@ -20,7 +21,11 @@ export class CommercialPropertyListingsController {
   findById(@Request() req, @Param('id') id: string): any {
     return this.listingsService.findCommercialPropertiesById(id, req.user as JwtUser);
   }
-
+  @UseGuards(JwtAuthGuard)
+  @Get('favorites/all')
+  findFavorites(@Request() req): any {
+    return this.listingsService.findFavoriteListings(req.user as JwtUser);
+  }
   @UseGuards(OptionalJwtAuthGuard)
   @Get('user/:email')
   findByEmail(@Request() req, @Param('email') email: string): Promise<CommercialPropertyListing[]> {
@@ -55,4 +60,9 @@ export class CommercialPropertyListingsController {
     this.listingsService.deleteListing(id);
     this.fileService.deleteDirectoryIfExists(imagePath);
   }
+  @UseGuards(JwtAuthGuard)
+  @Delete('favorites/:id')
+  deleteFavorite(@Request() req, @Param('id') id: string) {
+    this.listingsService.deleteFavorite(id, req.user as JwtUser);
+  }
 }

bizmatch-server/src/listings/commercial-property.service.ts

@@ -1,5 +1,5 @@
 import { BadRequestException, Inject, Injectable } from '@nestjs/common';
-import { and, count, eq, gte, ilike, inArray, lte, ne, or, SQL, sql } from 'drizzle-orm';
+import { and, arrayContains, count, eq, gte, ilike, inArray, lte, ne, or, SQL, sql } from 'drizzle-orm';
 import { NodePgDatabase } from 'drizzle-orm/node-postgres';
 import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
 import { Logger } from 'winston';
@@ -10,7 +10,7 @@ import { FileService } from '../file/file.service.js';
 import { GeoService } from '../geo/geo.service.js';
 import { CommercialPropertyListing, CommercialPropertyListingSchema } from '../models/db.model.js';
 import { CommercialPropertyListingCriteria, emailToDirName, JwtUser } from '../models/main.model.js';
-import { convertCommercialToDrizzleCommercial, convertDrizzleCommercialToCommercial, getDistanceQuery } from '../utils.js';
+import { convertCommercialToDrizzleCommercial, convertDrizzleBusinessToBusiness, convertDrizzleCommercialToCommercial, getDistanceQuery } from '../utils.js';
 
 @Injectable()
 export class CommercialPropertyService {
@@ -123,6 +123,14 @@ export class CommercialPropertyService {
       .where(and(...conditions))) as CommercialPropertyListing[];
     return listings.map(l => convertDrizzleCommercialToCommercial(l)) as CommercialPropertyListing[];
   }
+  // #### Find Favorites ########################################
+  async findFavoriteListings(user: JwtUser): Promise<CommercialPropertyListing[]> {
+    const userFavorites = await this.conn
+      .select()
+      .from(commercials)
+      .where(arrayContains(commercials.favoritesForUser, [user.username]));
+    return userFavorites.map(l => convertDrizzleBusinessToBusiness(l));
+  }
   // #### Find by imagePath ########################################
   async findByImagePath(imagePath: string, serial: string): Promise<CommercialPropertyListing> {
     const result = await this.conn
@@ -202,6 +210,15 @@ export class CommercialPropertyService {
   async deleteListing(id: string): Promise<void> {
     await this.conn.delete(commercials).where(eq(commercials.id, id));
   }
+  // #### DELETE Favorite ###################################
+  async deleteFavorite(id: string, user: JwtUser): Promise<void> {
+    await this.conn
+      .update(commercials)
+      .set({
+        favoritesForUser: sql`array_remove(${commercials.favoritesForUser}, ${user.username})`,
+      })
+      .where(sql`${commercials.id} = ${id}`);
+  }
   // ##############################################################
   // States
   // ##############################################################