imagePath changed

bizmatch-server/src/drizzle/import.ts

@@ -1,11 +1,13 @@
 import 'dotenv/config';
 import { drizzle } from 'drizzle-orm/node-postgres';
 import { existsSync, readFileSync, readdirSync, statSync, unlinkSync } from 'fs';
+import fs from 'fs-extra';
 import { join } from 'path';
 import pkg from 'pg';
 import { rimraf } from 'rimraf';
 import sharp from 'sharp';
 import { BusinessListing, CommercialPropertyListing, User, UserData } from 'src/models/db.model.js';
+import { emailToDirName } from 'src/models/main.model.js';
 import * as schema from './schema.js';
 const { Pool } = pkg;
 
@@ -32,6 +34,11 @@ const targetPathProfile = `./pictures/profile`;
 deleteFilesOfDir(targetPathProfile);
 const targetPathLogo = `./pictures/logo`;
 deleteFilesOfDir(targetPathLogo);
+const targetPathProperty = `./pictures/property`;
+deleteFilesOfDir(targetPathProperty);
+fs.ensureDirSync(`./pictures/logo`);
+fs.ensureDirSync(`./pictures/profile`);
+fs.ensureDirSync(`./pictures/property`);
 for (const userData of usersData) {
   const user: User = { firstname: '', lastname: '', email: '' };
   user.licensedIn = [];
@@ -58,20 +65,21 @@ for (const userData of usersData) {
   user.gender = userData.gender;
   user.created = new Date();
   user.updated = new Date();
-  const u = await db.insert(schema.users).values(user).returning({ insertedId: schema.users.id, gender: schema.users.gender });
-  generatedUserData.push(u[0].insertedId);
+  const u = await db.insert(schema.users).values(user).returning({ insertedId: schema.users.id, gender: schema.users.gender, email: schema.users.email });
+  generatedUserData.push(u[0]);
   i++;
+
   if (u[0].gender === 'male') {
     male++;
-    const data = readFileSync(`./pictures/profile_base/Mann_${male}.jpg`);
-    await storeProfilePicture(data, u[0].insertedId);
+    const data = readFileSync(`./pictures_base/profile/Mann_${male}.jpg`);
+    await storeProfilePicture(data, emailToDirName(u[0].email));
   } else {
     female++;
-    const data = readFileSync(`./pictures/profile_base/Frau_${female}.jpg`);
-    await storeProfilePicture(data, u[0].insertedId);
+    const data = readFileSync(`./pictures_base/profile/Frau_${female}.jpg`);
+    await storeProfilePicture(data, emailToDirName(u[0].email));
   }
-  const data = readFileSync(`./pictures/logos_base/${i}.jpg`);
-  await storeCompanyLogo(data, u[0].insertedId);
+  const data = readFileSync(`./pictures_base/logo/${i}.jpg`);
+  await storeCompanyLogo(data, emailToDirName(u[0].email));
 }
 //Business Listings
 filePath = `./data/businesses.json`;
@@ -82,7 +90,9 @@ for (const business of businessJsonData) {
   delete business.id;
   business.created = new Date(business.created);
   business.updated = new Date(business.created);
-  business.userId = getRandomItem(generatedUserData);
+  const user = getRandomItem(generatedUserData);
+  business.userId = user.insertedId;
+  business.imageName = emailToDirName(user.email);
   await db.insert(schema.businesses).values(business);
 }
 //Corporate Listings
@@ -92,14 +102,20 @@ const commercialJsonData = JSON.parse(data) as CommercialPropertyListing[]; // E
 for (const commercial of commercialJsonData) {
   const id = commercial.id;
   delete commercial.id;
-
+  const user = getRandomItem(generatedUserData);
   commercial.imageOrder = getFilenames(id);
-  commercial.imagePath = id;
+  commercial.imagePath = emailToDirName(user.email);
   const insertionDate = getRandomDateWithinLastYear();
   commercial.created = insertionDate;
   commercial.updated = insertionDate;
-  commercial.userId = getRandomItem(generatedUserData);
-  await db.insert(schema.commercials).values(commercial);
+  commercial.userId = user.insertedId;
+  const result = await db.insert(schema.commercials).values(commercial).returning();
+  //fs.ensureDirSync(`./pictures/property/${result[0].imagePath}/${result[0].serialId}`);
+  try {
+    fs.copySync(`./pictures_base/property/${id}`, `./pictures/property/${result[0].imagePath}/${result[0].serialId}`);
+  } catch (err) {
+    console.log(`----- No pictures available for ${id} ------`);
+  }
 }
 
 //End
@@ -115,7 +131,7 @@ function getRandomItem<T>(arr: T[]): T {
 }
 function getFilenames(id: string): string[] {
   try {
-    let filePath = `./pictures/property/${id}`;
+    let filePath = `./pictures_base/property/${id}`;
     return readdirSync(filePath);
   } catch (e) {
     return null;
@@ -141,14 +157,14 @@ async function storeProfilePicture(buffer: Buffer, userId: string) {
   await sharp(output).toFile(`./pictures/profile/${userId}.avif`);
 }
 
-async function storeCompanyLogo(buffer: Buffer, userId: string) {
+async function storeCompanyLogo(buffer: Buffer, adjustedEmail: string) {
   let quality = 50;
   const output = await sharp(buffer)
     .resize({ width: 300 })
     .avif({ quality }) // Verwende AVIF
     //.webp({ quality }) // Verwende Webp
     .toBuffer();
-  await sharp(output).toFile(`./pictures/logo/${userId}.avif`); // Ersetze Dateierweiterung
+  await sharp(output).toFile(`./pictures/logo/${adjustedEmail}.avif`); // Ersetze Dateierweiterung
   // await fs.outputFile(`./pictures/logo/${userId}`, file.buffer);
 }
 

bizmatch-server/src/drizzle/migrations/0000_burly_bruce_banner.sql

@@ -28,6 +28,7 @@ CREATE TABLE IF NOT EXISTS "businesses" (
 	"reasonForSale" varchar(255),
 	"brokerLicencing" varchar(255),
 	"internals" text,
+	"imagePath" varchar(200),
 	"created" timestamp,
 	"updated" timestamp,
 	"visits" integer,

bizmatch-server/src/drizzle/migrations/meta/0000_snapshot.json

@@ -1,5 +1,5 @@
 {
-  "id": "a27bba95-3910-4b41-b241-ce91f2201311",
+  "id": "fc58c59b-ac5c-406e-8fdb-b05de40aed17",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "5",
   "dialect": "pg",
@@ -147,6 +147,12 @@
           "primaryKey": false,
           "notNull": false
         },
+        "imagePath": {
+          "name": "imagePath",
+          "type": "varchar(200)",
+          "primaryKey": false,
+          "notNull": false
+        },
         "created": {
           "name": "created",
           "type": "timestamp",

bizmatch-server/src/drizzle/migrations/meta/_journal.json

@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "5",
-      "when": 1716417232952,
-      "tag": "0000_melted_doomsday",
+      "when": 1716495198537,
+      "tag": "0000_burly_bruce_banner",
       "breakpoints": true
     }
   ]

bizmatch-server/src/drizzle/schema.ts

@@ -49,6 +49,7 @@ export const businesses = pgTable('businesses', {
   reasonForSale: varchar('reasonForSale', { length: 255 }),
   brokerLicencing: varchar('brokerLicencing', { length: 255 }),
   internals: text('internals'),
+  imageName: varchar('imagePath', { length: 200 }),
   created: timestamp('created'),
   updated: timestamp('updated'),
   visits: integer('visits'),