Ticket Fixing: #111, #110, #108 (SortBy)

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

@@ -1,5 +1,5 @@
 import { BadRequestException, Inject, Injectable } from '@nestjs/common';
-import { and, arrayContains, count, eq, gte, ilike, inArray, lte, ne, or, SQL, sql } from 'drizzle-orm';
+import { and, arrayContains, asc, count, desc, 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';
@@ -130,6 +130,36 @@ export class BusinessListingService {
       query.where(whereClause);
     }
 
+    // Sortierung
+    switch (criteria.sortBy) {
+      case 'priceAsc':
+        query.orderBy(asc(businesses.price));
+        break;
+      case 'priceDesc':
+        query.orderBy(desc(businesses.price));
+        break;
+      case 'srAsc':
+        query.orderBy(asc(businesses.salesRevenue));
+        break;
+      case 'srDesc':
+        query.orderBy(desc(businesses.salesRevenue));
+        break;
+      case 'cfAsc':
+        query.orderBy(asc(businesses.cashFlow));
+        break;
+      case 'cfDesc':
+        query.orderBy(desc(businesses.cashFlow));
+        break;
+      case 'creationDateFirst':
+        query.orderBy(asc(businesses.created));
+        break;
+      case 'creationDateLast':
+        query.orderBy(desc(businesses.created));
+        break;
+      default:
+        // Keine spezifische Sortierung, Standardverhalten kann hier eingefügt werden
+        break;
+    }
     // Paginierung
     query.limit(length).offset(start);
 

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

@@ -1,5 +1,5 @@
 import { BadRequestException, Inject, Injectable } from '@nestjs/common';
-import { and, arrayContains, count, eq, gte, ilike, inArray, lte, ne, or, SQL, sql } from 'drizzle-orm';
+import { and, arrayContains, asc, count, desc, 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';
@@ -66,6 +66,24 @@ export class CommercialPropertyService {
       const whereClause = and(...whereConditions);
       query.where(whereClause);
     }
+    // Sortierung
+    switch (criteria.sortBy) {
+      case 'priceAsc':
+        query.orderBy(asc(commercials.price));
+        break;
+      case 'priceDesc':
+        query.orderBy(desc(commercials.price));
+        break;
+      case 'creationDateFirst':
+        query.orderBy(asc(commercials.created));
+        break;
+      case 'creationDateLast':
+        query.orderBy(desc(commercials.created));
+        break;
+      default:
+        // Keine spezifische Sortierung, Standardverhalten kann hier eingefügt werden
+        break;
+    }
 
     // Paginierung
     query.limit(length).offset(start);

bizmatch-server/src/models/db.model.ts

@@ -22,6 +22,8 @@ export interface UserData {
   created?: Date;
   updated?: Date;
 }
+export type SortByOptions = 'priceAsc' | 'priceDesc' | 'creationDateFirst' | 'creationDateLast' | 'nameAsc' | 'nameDesc' | 'srAsc' | 'srDesc' | 'cfAsc' | 'cfDesc';
+export type SortByTypes = 'professional' | 'listing' | 'business' | 'commercial';
 export type Gender = 'male' | 'female';
 export type CustomerType = 'buyer' | 'seller' | 'professional';
 export type CustomerSubType = 'broker' | 'cpa' | 'attorney' | 'titleCompany' | 'surveyor' | 'appraiser';
@@ -143,8 +145,7 @@ export const GeoSchema = z.object({
     },
   ),
 });
-const phoneRegex = /^\(\d{3}\)\s\d{3}-\d{4}$/;
-
+const phoneRegex = /^(\+1|1)?[-.\s]?\(?[2-9]\d{2}\)?[-.\s]?\d{3}[-.\s]?\d{4}$/;
 export const UserSchema = z
   .object({
     id: z.string().uuid().optional().nullable(),

bizmatch-server/src/models/main.model.ts

@@ -1,5 +1,5 @@
 import Stripe from 'stripe';
-import { BusinessListing, CommercialPropertyListing, Sender, User } from './db.model';
+import { BusinessListing, CommercialPropertyListing, Sender, SortByOptions, SortByTypes, User } from './db.model';
 import { State } from './server.model';
 
 export interface StatesResult {
@@ -11,6 +11,12 @@ export interface KeyValue {
   name: string;
   value: string;
 }
+export interface KeyValueAsSortBy {
+  name: string;
+  value: SortByOptions;
+  type?: SortByTypes;
+  selectName?: string;
+}
 export interface KeyValueRatio {
   label: string;
   value: number;
@@ -63,6 +69,7 @@ export interface ListCriteria {
   state: string;
   city: GeoResult;
   prompt: string;
+  sortBy: SortByOptions;
   searchType: 'exact' | 'radius';
   // radius: '5' | '20' | '50' | '100' | '200' | '300' | '400' | '500';
   radius: number;

bizmatch-server/src/select-options/select-options.controller.ts

@@ -15,6 +15,7 @@ export class SelectOptionsController {
       typesOfCommercialProperty: this.selectOptionsService.typesOfCommercialProperty,
       customerSubTypes: this.selectOptionsService.customerSubTypes,
       distances: this.selectOptionsService.distances,
+      sortByOptions: this.selectOptionsService.sortByOptions,
     };
   }
 }

bizmatch-server/src/select-options/select-options.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { ImageType, KeyValue, KeyValueStyle } from '../models/main.model';
+import { ImageType, KeyValue, KeyValueAsSortBy, KeyValueStyle } from '../models/main.model';
 
 @Injectable()
 export class SelectOptionsService {
@@ -35,7 +35,19 @@ export class SelectOptionsService {
     { name: '$1M', value: '1000000' },
     { name: '$5M', value: '5000000' },
   ];
-
+  public sortByOptions: Array<KeyValueAsSortBy> = [
+    { name: 'Price Asc', value: 'priceAsc', type: 'listing' },
+    { name: 'Price Desc', value: 'priceDesc', type: 'listing' },
+    { name: 'Sales Revenue Asc', value: 'srAsc', type: 'business' },
+    { name: 'Sales Revenue Desc', value: 'srDesc', type: 'business' },
+    { name: 'Cash Flow Asc', value: 'cfAsc', type: 'business' },
+    { name: 'Cash Flow Desc', value: 'cfDesc', type: 'business' },
+    { name: 'Creation Date First', value: 'creationDateFirst', type: 'listing' },
+    { name: 'Creation Date Last', value: 'creationDateLast', type: 'listing' },
+    { name: 'Name Asc', value: 'nameAsc', type: 'professional' },
+    { name: 'Name Desc', value: 'nameDesc', type: 'professional' },
+    { name: 'Sort', value: null, selectName: 'Default Sorting' },
+  ];
   public distances: Array<KeyValue> = [
     { name: '5 miles', value: '5' },
     { name: '20 miles', value: '20' },

bizmatch-server/src/user/user.service.ts

@@ -1,5 +1,5 @@
 import { Inject, Injectable } from '@nestjs/common';
-import { and, count, eq, ilike, inArray, or, SQL, sql } from 'drizzle-orm';
+import { and, asc, count, desc, eq, ilike, inArray, or, SQL, sql } from 'drizzle-orm';
 import { NodePgDatabase } from 'drizzle-orm/node-postgres/driver';
 import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
 import { Logger } from 'winston';
@@ -64,7 +64,18 @@ export class UserService {
       const whereClause = and(...whereConditions);
       query.where(whereClause);
     }
-
+    // Sortierung
+    switch (criteria.sortBy) {
+      case 'nameAsc':
+        query.orderBy(asc(schema.users.lastname));
+        break;
+      case 'nameDesc':
+        query.orderBy(desc(schema.users.lastname));
+        break;
+      default:
+        // Keine spezifische Sortierung, Standardverhalten kann hier eingefügt werden
+        break;
+    }
     // Paginierung
     query.limit(length).offset(start);