aknuth
/
bizmatch-project
1
0
Fork 0
Code Issues 7 Pull Requests Packages Projects 5 Releases Wiki Activity

Fix for Issue #45

This commit is contained in:
Andreas Knuth 2024-05-24 10:52:11 -05:00
parent f9d9c6ad9e
commit c9d94e973a
11 changed files with 30 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bizmatch-server/src/file/file.service.ts
View File

@ -128,22 +128,6 @@ export class FileService {
let timeTaken = Date.now() - start; let timeTaken = Date.now() - start;
this.logger.info(`Quality: ${quality} - Time: ${timeTaken} milliseconds`); this.logger.info(`Quality: ${quality} - Time: ${timeTaken} milliseconds`);
} }
// getProfileImagesForUsers(userids: string) {
// const ids = userids.split(',');
// let result = {};
// for (const id of ids) {
// result = { ...result, [id]: fs.existsSync(`./pictures/profile/${id}.avif`) };
// }
// return result;
// }
// getCompanyLogosForUsers(userids: string) {
// const ids = userids.split(',');
// let result = {};
// for (const id of ids) {
// result = { ...result, [id]: fs.existsSync(`./pictures/logo/${id}.avif`) };
// }
// return result;
// }
deleteImage(path: string) { deleteImage(path: string) {
fs.unlinkSync(path); fs.unlinkSync(path);
} }

20
bizmatch-server/src/image/image.controller.ts
View File

@ -1,4 +1,4 @@
import { Controller, Delete, Get, Inject, Param, Post, UploadedFile, UseInterceptors } from '@nestjs/common'; import { Controller, Delete, Inject, Param, Post, UploadedFile, UseInterceptors } from '@nestjs/common';
import { FileInterceptor } from '@nestjs/platform-express'; import { FileInterceptor } from '@nestjs/platform-express';
import { WINSTON_MODULE_PROVIDER } from 'nest-winston'; import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
import { Logger } from 'winston'; import { Logger } from 'winston';
@ -6,9 +6,6 @@ import { FileService } from '../file/file.service.js';
import { ListingsService } from '../listings/listings.service.js'; import { ListingsService } from '../listings/listings.service.js';
import { SelectOptionsService } from '../select-options/select-options.service.js'; import { SelectOptionsService } from '../select-options/select-options.service.js';
import { commercials } from '../drizzle/schema.js';
import { CommercialPropertyListing } from '../models/db.model.js';
@Controller('image') @Controller('image')
export class ImageController { export class ImageController {
constructor( constructor(
@ -24,20 +21,7 @@ export class ImageController {
@UseInterceptors(FileInterceptor('file')) @UseInterceptors(FileInterceptor('file'))
async uploadPropertyPicture(@UploadedFile() file: Express.Multer.File, @Param('imagePath') imagePath: string, @Param('serial') serial: string) { async uploadPropertyPicture(@UploadedFile() file: Express.Multer.File, @Param('imagePath') imagePath: string, @Param('serial') serial: string) {
const imagename = await this.fileService.storePropertyPicture(file, imagePath, serial); const imagename = await this.fileService.storePropertyPicture(file, imagePath, serial);
await this.listingService.addImage(imagePath, imagename); await this.listingService.addImage(imagePath, serial, imagename);
}
@Get(':email/:serial')
async getPropertyImagesById(@Param('email') adjustedEmail: string, @Param('serial') serial: string): Promise<any> {
const result = await this.listingService.findByImagePath(adjustedEmail);
const listing = result as CommercialPropertyListing;
if (listing.imageOrder) {
return listing.imageOrder;
} else {
const imageOrder = await this.fileService.getPropertyImages(adjustedEmail, serial);
listing.imageOrder = imageOrder;
this.listingService.updateListing(listing.id, listing, commercials);
return imageOrder;
}
} }
@Delete('propertyPicture/:imagePath/:serial/:imagename') @Delete('propertyPicture/:imagePath/:serial/:imagename')
async deletePropertyImagesById(@Param('imagePath') imagePath: string, @Param('serial') serial: string, @Param('imagename') imagename: string): Promise<any> { async deletePropertyImagesById(@Param('imagePath') imagePath: string, @Param('serial') serial: string, @Param('imagename') imagename: string): Promise<any> {

2
bizmatch-server/src/listings/business-listings.controller.ts
View File

@ -34,7 +34,7 @@ export class BusinessListingsController {
@Put() @Put()
update(@Body() listing: any) { update(@Body() listing: any) {
this.logger.info(`Save Listing`); this.logger.info(`Save Listing`);
return this.listingsService.updateListing(listing.id, listing, businesses); return this.listingsService.updateBusinessListing(listing.id, listing);
} }
@Delete(':id') @Delete(':id')
deleteById(@Param('id') id: string) { deleteById(@Param('id') id: string) {

7
bizmatch-server/src/listings/commercial-property-listings.controller.ts
View File

@ -38,16 +38,11 @@ export class CommercialPropertyListingsController {
@Put() @Put()
async update(@Body() listing: any) { async update(@Body() listing: any) {
this.logger.info(`Save Listing`); this.logger.info(`Save Listing`);
return await this.listingsService.updateListing(listing.id, listing, commercials); return await this.listingsService.updateCommercialPropertyListing(listing.id, listing);
} }
@Delete(':id/:imagePath') @Delete(':id/:imagePath')
deleteById(@Param('id') id: string, @Param('imagePath') imagePath: string) { deleteById(@Param('id') id: string, @Param('imagePath') imagePath: string) {
this.listingsService.deleteListing(id, commercials); this.listingsService.deleteListing(id, commercials);
this.fileService.deleteDirectoryIfExists(imagePath); this.fileService.deleteDirectoryIfExists(imagePath);
} }
@Put('imageOrder/:id')
async changeImageOrder(@Param('id') id: string, @Body() imageOrder: string[]) {
this.listingsService.updateImageOrder(id, imageOrder);
}
} }

37
bizmatch-server/src/listings/listings.service.ts
View File

@ -6,6 +6,7 @@ import { BusinessListing, CommercialPropertyListing } from 'src/models/db.model.
import { Logger } from 'winston'; import { Logger } from 'winston';
import * as schema from '../drizzle/schema.js'; import * as schema from '../drizzle/schema.js';
import { PG_CONNECTION, businesses, commercials } from '../drizzle/schema.js'; import { PG_CONNECTION, businesses, commercials } from '../drizzle/schema.js';
import { FileService } from '../file/file.service.js';
import { ListingCriteria } from '../models/main.model.js'; import { ListingCriteria } from '../models/main.model.js';
@Injectable() @Injectable()
@ -13,6 +14,7 @@ export class ListingsService {
constructor( constructor(
@Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger, @Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger,
@Inject(PG_CONNECTION) private conn: NodePgDatabase<typeof schema>, @Inject(PG_CONNECTION) private conn: NodePgDatabase<typeof schema>,
private fileService: FileService,
) {} ) {}
private getConditions(criteria: ListingCriteria, table: typeof businesses | typeof commercials): any[] { private getConditions(criteria: ListingCriteria, table: typeof businesses | typeof commercials): any[] {
const conditions = []; const conditions = [];
@ -68,11 +70,11 @@ export class ListingsService {
.where(sql`${table.id} = ${id}`); .where(sql`${table.id} = ${id}`);
return result[0] as BusinessListing | CommercialPropertyListing; return result[0] as BusinessListing | CommercialPropertyListing;
} }
async findByImagePath(imagePath: string): Promise<CommercialPropertyListing> { async findByImagePath(imagePath: string, serial: string): Promise<CommercialPropertyListing> {
const result = await this.conn const result = await this.conn
.select() .select()
.from(commercials) .from(commercials)
.where(sql`${commercials.imagePath} = ${imagePath}`); .where(and(sql`${commercials.imagePath} = ${imagePath}`, sql`${commercials.serialId} = ${serial}`));
return result[0] as CommercialPropertyListing; return result[0] as CommercialPropertyListing;
} }
async findByUserId(userId: string, table: typeof businesses | typeof commercials): Promise<BusinessListing[] | CommercialPropertyListing[]> { async findByUserId(userId: string, table: typeof businesses | typeof commercials): Promise<BusinessListing[] | CommercialPropertyListing[]> {
@ -86,13 +88,24 @@ export class ListingsService {
return createdListing as BusinessListing | CommercialPropertyListing; return createdListing as BusinessListing | CommercialPropertyListing;
} }
async updateListing(id: string, data: BusinessListing | CommercialPropertyListing, table: typeof businesses | typeof commercials): Promise<BusinessListing | CommercialPropertyListing> { async updateCommercialPropertyListing(id: string, data: CommercialPropertyListing): Promise<BusinessListing | CommercialPropertyListing> {
data.updated = new Date(); data.updated = new Date();
data.created = new Date(data.created); data.created = new Date(data.created);
const [updateListing] = await this.conn.update(table).set(data).where(eq(table.id, id)).returning(); const imageOrder = await this.fileService.getPropertyImages(data.imagePath, String(data.serialId));
let difference = imageOrder.filter(x => !data.imageOrder.includes(x)).concat(data.imageOrder.filter(x => !imageOrder.includes(x)));
if (difference.length > 0) {
this.logger.warn(`changes between image directory and imageOrder in listing ${data.serialId}: ${difference.join(',')}`);
data.imageOrder = imageOrder;
}
const [updateListing] = await this.conn.update(commercials).set(data).where(eq(commercials.id, id)).returning();
return updateListing as BusinessListing | CommercialPropertyListing;
}
async updateBusinessListing(id: string, data: BusinessListing): Promise<BusinessListing | CommercialPropertyListing> {
data.updated = new Date();
data.created = new Date(data.created);
const [updateListing] = await this.conn.update(businesses).set(data).where(eq(businesses.id, id)).returning();
return updateListing as BusinessListing | CommercialPropertyListing; return updateListing as BusinessListing | CommercialPropertyListing;
} }
async deleteListing(id: string, table: typeof businesses | typeof commercials): Promise<void> { async deleteListing(id: string, table: typeof businesses | typeof commercials): Promise<void> {
await this.conn.delete(table).where(eq(table.id, id)); await this.conn.delete(table).where(eq(table.id, id));
} }
@ -106,23 +119,17 @@ export class ListingsService {
// ############################################################## // ##############################################################
// Images for commercial Properties // Images for commercial Properties
// ############################################################## // ##############################################################
async updateImageOrder(id: string, imageOrder: string[]) {
const listing = (await this.findById(id, commercials)) as unknown as CommercialPropertyListing;
listing.imageOrder = imageOrder;
await this.updateListing(listing.id, listing, commercials);
}
async deleteImage(id: string, name: string) { async deleteImage(id: string, name: string) {
const listing = (await this.findById(id, commercials)) as unknown as CommercialPropertyListing; const listing = (await this.findById(id, commercials)) as unknown as CommercialPropertyListing;
const index = listing.imageOrder.findIndex(im => im === name); const index = listing.imageOrder.findIndex(im => im === name);
if (index > -1) { if (index > -1) {
listing.imageOrder.splice(index, 1); listing.imageOrder.splice(index, 1);
await this.updateListing(listing.id, listing, commercials); await this.updateCommercialPropertyListing(listing.id, listing);
} }
} }
async addImage(imagePath: string, imagename: string) { async addImage(imagePath: string, serial: string, imagename: string) {
const listing = (await this.findByImagePath(imagePath)) as unknown as CommercialPropertyListing; const listing = (await this.findByImagePath(imagePath, serial)) as unknown as CommercialPropertyListing;
listing.imageOrder.push(imagename); listing.imageOrder.push(imagename);
await this.updateListing(listing.id, listing, commercials); await this.updateCommercialPropertyListing(listing.id, listing);
} }
} }

2
bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.html
View File

@ -49,7 +49,7 @@
</div> </div>
<div class="col-12 md:col-6"> <div class="col-12 md:col-6">
<p-galleria [value]="propertyImages" [showIndicators]="true" [showThumbnails]="false" [responsiveOptions]="responsiveOptions" [containerStyle]="{ 'max-width': '640px' }" [numVisible]="5"> <p-galleria [value]="listing.imageOrder" [showIndicators]="true" [showThumbnails]="false" [responsiveOptions]="responsiveOptions" [containerStyle]="{ 'max-width': '640px' }" [numVisible]="5">
<ng-template pTemplate="item" let-item> <ng-template pTemplate="item" let-item>
<img src="{{ env.imageBaseUrl }}/pictures/property/{{ listing.imagePath }}/{{ listing.serialId }}/{{ item }}" style="width: 100%" /> <img src="{{ env.imageBaseUrl }}/pictures/property/{{ listing.imagePath }}/{{ listing.serialId }}/{{ item }}" style="width: 100%" />
</ng-template> </ng-template>

3
bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.ts
View File

@ -27,7 +27,6 @@ import { getCriteriaStateObject, getSessionStorageHandler, map2User } from '../.
styleUrl: './details-commercial-property-listing.component.scss', styleUrl: './details-commercial-property-listing.component.scss',
}) })
export class DetailsCommercialPropertyListingComponent { export class DetailsCommercialPropertyListingComponent {
// listings: Array<BusinessListing>;
responsiveOptions = [ responsiveOptions = [
{ {
breakpoint: '1199px', breakpoint: '1199px',
@ -49,7 +48,6 @@ export class DetailsCommercialPropertyListingComponent {
listing: CommercialPropertyListing; listing: CommercialPropertyListing;
criteria: ListingCriteria; criteria: ListingCriteria;
mailinfo: MailInfo; mailinfo: MailInfo;
propertyImages: string[] = [];
environment = environment; environment = environment;
user: KeycloakUser; user: KeycloakUser;
listingUser: User; listingUser: User;
@ -79,7 +77,6 @@ export class DetailsCommercialPropertyListingComponent {
const token = await this.keycloakService.getToken(); const token = await this.keycloakService.getToken();
this.user = map2User(token); this.user = map2User(token);
this.listing = await lastValueFrom(this.listingsService.getListingById(this.id, 'commercialProperty')); this.listing = await lastValueFrom(this.listingsService.getListingById(this.id, 'commercialProperty'));
this.propertyImages = await this.imageService.getPropertyImages(this.listing.imagePath, this.listing.serialId);
this.listingUser = await this.userService.getById(this.listing.userId); this.listingUser = await this.userService.getById(this.listing.userId);
this.description = this.sanitizer.bypassSecurityTrustHtml(this.listing.description); this.description = this.sanitizer.bypassSecurityTrustHtml(this.listing.description);
} }

4
bizmatch/src/app/pages/subscription/edit-commercial-property-listing/edit-commercial-property-listing.component.html
View File

@ -111,9 +111,9 @@
</div> </div>
</div> </div>
</div> </div>
@if (propertyImages?.length>0){ @if (listing && listing.imageOrder?.length>0){
<div class="p-2 border-1 surface-border border-round mb-4 image-container" cdkDropListGroup mixedCdkDragDrop (dropped)="onDrop($event)" cdkDropListOrientation="horizontal"> <div class="p-2 border-1 surface-border border-round mb-4 image-container" cdkDropListGroup mixedCdkDragDrop (dropped)="onDrop($event)" cdkDropListOrientation="horizontal">
@for (image of propertyImages; track image) { @for (image of listing.imageOrder; track listing.imageOrder) {
<span cdkDropList mixedCdkDropList> <span cdkDropList mixedCdkDropList>
<div cdkDrag mixedCdkDragSizeHelper class="image-wrap"> <div cdkDrag mixedCdkDragSizeHelper class="image-wrap">
<img src="{{ env.imageBaseUrl }}/pictures/property/{{ listing.imagePath }}/{{ listing.serialId }}/{{ image }}?_ts={{ ts }}" [alt]="image" class="shadow-2" cdkDrag /> <img src="{{ env.imageBaseUrl }}/pictures/property/{{ listing.imagePath }}/{{ listing.serialId }}/{{ image }}?_ts={{ ts }}" [alt]="image" class="shadow-2" cdkDrag />

7
bizmatch/src/app/pages/subscription/edit-commercial-property-listing/edit-commercial-property-listing.component.ts
View File

@ -63,7 +63,6 @@ export class EditCommercialPropertyListingComponent {
user: User; user: User;
maxFileSize = 3000000; maxFileSize = 3000000;
environment = environment; environment = environment;
propertyImages: string[];
responsiveOptions = [ responsiveOptions = [
{ {
breakpoint: '1199px', breakpoint: '1199px',
@ -137,7 +136,6 @@ export class EditCommercialPropertyListingComponent {
this.listing.description = this.data?.description; this.listing.description = this.data?.description;
} }
} }
this.propertyImages = await this.imageService.getPropertyImages(this.listing.imagePath, this.listing.serialId);
} }
async save() { async save() {
@ -179,7 +177,6 @@ export class EditCommercialPropertyListingComponent {
if (event.type === HttpEventType.Response) { if (event.type === HttpEventType.Response) {
console.log('Upload abgeschlossen', event.body); console.log('Upload abgeschlossen', event.body);
this.loadingService.stopLoading('uploadImage'); this.loadingService.stopLoading('uploadImage');
this.propertyImages = await this.imageService.getPropertyImages(this.listing.imagePath, this.listing.serialId);
this.listing = await lastValueFrom(this.listingsService.getListingById(this.id, 'commercialProperty')); this.listing = await lastValueFrom(this.listingsService.getListingById(this.id, 'commercialProperty'));
} }
}, },
@ -206,7 +203,6 @@ export class EditCommercialPropertyListingComponent {
this.listing.imageOrder = this.listing.imageOrder.filter(item => item !== imageName); this.listing.imageOrder = this.listing.imageOrder.filter(item => item !== imageName);
await Promise.all([this.imageService.deleteListingImage(this.listing.imagePath, this.listing.serialId, imageName), this.listingsService.save(this.listing, 'commercialProperty')]); await Promise.all([this.imageService.deleteListingImage(this.listing.imagePath, this.listing.serialId, imageName), this.listingsService.save(this.listing, 'commercialProperty')]);
this.messageService.add({ severity: 'info', summary: 'Confirmed', detail: 'Image deleted' }); this.messageService.add({ severity: 'info', summary: 'Confirmed', detail: 'Image deleted' });
this.propertyImages = await this.imageService.getPropertyImages(this.listing.imagePath, this.listing.serialId);
}, },
reject: () => { reject: () => {
// this.messageService.add({ severity: 'error', summary: 'Rejected', detail: 'You have rejected' }); // this.messageService.add({ severity: 'error', summary: 'Rejected', detail: 'You have rejected' });
@ -216,8 +212,7 @@ export class EditCommercialPropertyListingComponent {
} }
onDrop(event: { previousIndex: number; currentIndex: number }) { onDrop(event: { previousIndex: number; currentIndex: number }) {
moveItemInArray(this.propertyImages, event.previousIndex, event.currentIndex); moveItemInArray(this.listing.imageOrder, event.previousIndex, event.currentIndex);
this.listingsService.changeImageOrder(this.listing.id, this.propertyImages);
} }
changeListingCategory(value: 'business' | 'commercialProperty') { changeListingCategory(value: 'business' | 'commercialProperty') {
routeListingWithState(this.router, value, this.listing); routeListingWithState(this.router, value, this.listing);

3
bizmatch/src/app/services/image.service.ts
View File

@ -37,7 +37,4 @@ export class ImageService {
const adjustedEmail = emailToDirName(email); const adjustedEmail = emailToDirName(email);
await lastValueFrom(this.http.delete<[]>(`${this.apiBaseUrl}/bizmatch/image/profile/${adjustedEmail}`)); await lastValueFrom(this.http.delete<[]>(`${this.apiBaseUrl}/bizmatch/image/profile/${adjustedEmail}`));
} }
async getPropertyImages(imagePath: string, serial: number): Promise<string[]> {
return await lastValueFrom(this.http.get<string[]>(`${this.apiBaseUrl}/bizmatch/image/${imagePath}/${serial}`));
}
} }

3
bizmatch/src/app/services/listings.service.ts
View File

@ -40,7 +40,4 @@ export class ListingsService {
async deleteCommercialPropertyListing(id: string, imagePath: string) { async deleteCommercialPropertyListing(id: string, imagePath: string) {
await lastValueFrom(this.http.delete<ListingType>(`${this.apiBaseUrl}/bizmatch/listings/commercialProperty/${id}/${imagePath}`)); await lastValueFrom(this.http.delete<ListingType>(`${this.apiBaseUrl}/bizmatch/listings/commercialProperty/${id}/${imagePath}`));
} }
async changeImageOrder(id: string, propertyImages: string[]): Promise<string[]> {
return await lastValueFrom(this.http.put<string[]>(`${this.apiBaseUrl}/bizmatch/listings/commercialProperty/imageOrder/${id}`, propertyImages));
}
} }