fix inputnumber, Umbau auf redis-om, Neubenamung

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

@@ -1,65 +1,118 @@
 import { Inject, Injectable } from '@nestjs/common';
 import {
   BusinessListing,
-  InvestmentsListing,
+  CommercialPropertyListing,
   ListingCriteria,
-  ProfessionalsBrokersListing,
+  ListingType
 } from '../models/main.model.js';
 import { convertStringToNullUndefined } from '../utils.js';
 import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
 import { Logger } from 'winston';
+import { EntityData, EntityId, Repository, Schema, SchemaDefinition } from 'redis-om';
+import { REDIS_CLIENT } from '../redis/redis.module.js';
 
 @Injectable()
 export class ListingsService {
-  constructor(@Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger) {}
-  
-  async setListing(
-    value: BusinessListing | ProfessionalsBrokersListing | InvestmentsListing,
-    id?: string,
-  ) {
-    // if (!id) {
-    //   id = await this.redisService.getId(LISTINGS);
-    //   value.id = id;
-    //   this.logger.info(`No ID - creating new one:${id}`)
-    // } else {
-    //   this.logger.info(`ID available:${id}`)
-    // }
-    //this.redisService.setJson(id, value);
+  businessListingRepository:Repository;
+  commercialPropertyListingRepository:Repository;
+  baseListingSchemaDef : SchemaDefinition = {
+    id: { type: 'string' },
+    userId: { type: 'string' },
+    listingsCategory: { type: 'string' },    
+    title: { type: 'string' },
+    description: { type: 'string' },
+    country: { type: 'string' },
+    state:{ type: 'string' },    
+    city:{ type: 'string' },
+    zipCode: { type: 'number' },
+    type: { type: 'string' },
+    price: { type: 'number' },
+    favoritesForUser:{ type: 'string[]' },
+    hideImage:{ type: 'boolean' },
+    draft:{ type: 'boolean' },
+    created:{ type: 'date' },
+    updated:{ type: 'date' }
+  }
+  businessListingSchemaDef : SchemaDefinition = {
+    ...this.baseListingSchemaDef,
+    salesRevenue: { type: 'number' },    
+    cashFlow: { type: 'number' },    
+    employees: { type: 'number' },    
+    established: { type: 'number' },    
+    internalListingNumber: { type: 'number' },    
+    realEstateIncluded:{ type: 'boolean' },
+    leasedLocation:{ type: 'boolean' },
+    franchiseResale:{ type: 'boolean' },
+    supportAndTraining: { type: 'string' },
+    reasonForSale: { type: 'string' },
+    brokerLicencing: { type: 'string' },
+    internals: { type: 'string' },
+  }
+  commercialPropertyListingSchemaDef : SchemaDefinition = {
+    ...this.baseListingSchemaDef,
+    imageNames:{ type: 'string[]' },
+  }
+  businessListingSchema = new Schema('businessListing',this.businessListingSchemaDef, {
+      dataStructure: 'JSON'
+  })
+  commercialPropertyListingSchema = new Schema('commercialPropertyListing',this.commercialPropertyListingSchemaDef, {
+    dataStructure: 'JSON'
+  })
+  constructor(@Inject(REDIS_CLIENT) private readonly redis: any){
+    this.businessListingRepository = new Repository(this.businessListingSchema, redis);
+    this.commercialPropertyListingRepository = new Repository(this.commercialPropertyListingSchema, redis)
+    this.businessListingRepository.createIndex();
+    this.commercialPropertyListingRepository.createIndex();
+  }
+  async saveListing(listing: BusinessListing | CommercialPropertyListing) {
+    const repo=listing.listingsCategory==='business'?this.businessListingRepository:this.commercialPropertyListingRepository;
+    let result
+    if (listing.id){
+      result = await repo.save(listing.id,listing as any)
+    } else {
+      result = await repo.save(listing as any)
+      listing.id=result[EntityId];
+      result = await repo.save(listing.id,listing as any)
+    }
+    return result;
+  }
+  async getCommercialPropertyListingById(id: string) {
+    return await this.commercialPropertyListingRepository.fetch(id)
+  }
+  async getBusinessListingById(id: string) {
+    return await this.businessListingRepository.fetch(id)
+  }
+  async deleteBusinessListing(id: string){
+    return await this.businessListingRepository.remove(id);
+  }
+  async deleteCommercialPropertyListing(id: string){
+    return await this.commercialPropertyListingRepository.remove(id);
+  }
+  async getAllBusinessListings(start?: number, end?: number) {
+    return await this.businessListingRepository.search().return.all()
+  }
+  async getAllCommercialListings(start?: number, end?: number) {
+    return await this.commercialPropertyListingRepository.search().return.all()
   }
 
-  async getListingById(id: string) {
-    //return await this.redisService.getJson(id, LISTINGS);
+
+  async findBusinessListings(criteria:ListingCriteria): Promise<any> {
+    let listings = await this.getAllBusinessListings();
+    return this.find(criteria,listings);
   }
-  deleteListing(id: string){
-    //this.redisService.delete(id);
-    this.logger.info(`delete listing with ID:${id}`)
+  async findCommercialPropertyListings(criteria:ListingCriteria): Promise<any> {
+    let listings = await this.getAllCommercialListings();
+    return this.find(criteria,listings);
   }
-  async getAllListings(start?: number, end?: number) {
-    // const searchResult = await this.redisService.search(LISTINGS, '*');
-    // const listings = searchResult.slice(1).reduce((acc, item, index, array) => {
-    //   if (index % 2 === 1) {
-    //     try {
-    //       const listing = JSON.parse(item[1]); 
-    //       acc.push(listing);
-    //     } catch (error) {
-    //       console.error('Fehler beim Parsen des JSON-Strings: ', error);
-    //     }
-    //   }
-    //   return acc;
-    // }, []);
-    // return listings;
-    return [];
-  }
-  async find(criteria:ListingCriteria): Promise<any> {
-    let listings = await this.getAllListings();
+  async find(criteria:ListingCriteria, listings: any[]): Promise<any> {
     listings=listings.filter(l=>l.listingsCategory===criteria.listingsCategory);
     if (convertStringToNullUndefined(criteria.type)){
       console.log(criteria.type);
       listings=listings.filter(l=>l.type===criteria.type);
     }
-    if (convertStringToNullUndefined(criteria.location)){
-      console.log(criteria.location);
-      listings=listings.filter(l=>l.location===criteria.location);
+    if (convertStringToNullUndefined(criteria.state)){
+      console.log(criteria.state);
+      listings=listings.filter(l=>l.state===criteria.state);
     }
     if (convertStringToNullUndefined(criteria.minPrice)){
       console.log(criteria.minPrice);