Fixes für input fields, #60 -> AuditService

2024-09-12 19:48:29 +02:00
parent d2f6b3ec3f
commit 40ba402c70
13 changed files with 155 additions and 104 deletions
--- a/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.html
+++ b/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.html
@@ -43,7 +43,7 @@
            </button>
          </div>
          }
-          <share-button button="print" showText="true"></share-button>
+          <share-button button="print" showText="true" (click)="createEvent('print')"></share-button>
          <!-- <share-button button="email" showText="true"></share-button> -->
          <div class="inline">
            <button class="share share-email text-white font-bold text-xs py-1.5 px-2 inline-flex items-center" (click)="showShareByEMail()">
@@ -52,9 +52,9 @@
            </button>
          </div>

-          <share-button button="facebook" showText="true"></share-button>
-          <share-button button="x" showText="true"></share-button>
-          <share-button button="linkedin" showText="true"></share-button>
+          <share-button button="facebook" showText="true" (click)="createEvent('facebook')"></share-button>
+          <share-button button="x" showText="true" (click)="createEvent('x')"></share-button>
+          <share-button button="linkedin" showText="true" (click)="createEvent('linkedin')"></share-button>
        </div>
      </div>

@@ -70,7 +70,7 @@
          </div>

          <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-            <app-validated-input label="Phone Number" name="phoneNumber" [(ngModel)]="mailinfo.sender.phoneNumber" kind="tel" mask="(000) 000-0000"></app-validated-input>
+            <app-validated-input label="Phone Number" name="phoneNumber" [(ngModel)]="mailinfo.sender.phoneNumber" mask="(000) 000-0000"></app-validated-input>
            <!-- <app-validated-input label="Country/State" name="state" [(ngModel)]="mailinfo.sender.state"></app-validated-input> -->
            <app-validated-ng-select label="State" name="state" [(ngModel)]="mailinfo.sender.state" [items]="selectOptions?.states"></app-validated-ng-select>
          </div>
--- a/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.ts
+++ b/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.ts
@@ -4,7 +4,7 @@ import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 import { KeycloakService } from 'keycloak-angular';
 import { ShareButton } from 'ngx-sharebuttons/button';
 import { lastValueFrom } from 'rxjs';
-import { BusinessListing, User } from '../../../../../../bizmatch-server/src/models/db.model';
+import { BusinessListing, EventTypeEnum, User } from '../../../../../../bizmatch-server/src/models/db.model';
 import { KeycloakUser, MailInfo } from '../../../../../../bizmatch-server/src/models/main.model';
 import { environment } from '../../../../environments/environment';
 import { EMailService } from '../../../components/email/email.service';
@@ -14,6 +14,7 @@ import { ValidatedNgSelectComponent } from '../../../components/validated-ng-sel
 import { ValidatedTextareaComponent } from '../../../components/validated-textarea/validated-textarea.component';
 import { ValidationMessagesService } from '../../../components/validation-messages.service';
 import { AuditService } from '../../../services/audit.service';
+import { GeoService } from '../../../services/geo.service';
 import { HistoryService } from '../../../services/history.service';
 import { ListingsService } from '../../../services/listings.service';
 import { MailService } from '../../../services/mail.service';
@@ -73,6 +74,7 @@ export class DetailsBusinessListingComponent {
    private messageService: MessageService,
    private auditService: AuditService,
    public emailService: EMailService,
+    private geoService: GeoService,
  ) {
    this.router.events.subscribe(event => {
      if (event instanceof NavigationEnd) {
@@ -89,9 +91,9 @@ export class DetailsBusinessListingComponent {
      this.user = await this.userService.getByMail(this.keycloakUser.email);
      this.mailinfo = createMailInfo(this.user);
    }
-    this.auditService.createEvent({ listingId: this.listing.id, eventType: 'view', eventTimestamp: new Date(), userAgent: navigator.userAgent, userId: this.user?.email });
    try {
      this.listing = await lastValueFrom(this.listingsService.getListingById(this.id, 'business'));
+      this.auditService.createEvent(this.listing.id, 'view', this.user?.email);
      this.listingUser = await this.userService.getByMail(this.listing.email);
      this.description = this.sanitizer.bypassSecurityTrustHtml(this.listing.description);
    } catch (error) {
@@ -110,6 +112,7 @@ export class DetailsBusinessListingComponent {
      this.mailinfo.email = this.listingUser.email;
      this.mailinfo.listing = this.listing;
      await this.mailService.mail(this.mailinfo);
+      this.auditService.createEvent(this.listing.id, 'contact', this.user?.email);
      this.messageService.addMessage({ severity: 'success', text: 'Your message has been sent to the creator of the listing', duration: 3000 });
    } catch (error) {
      this.messageService.addMessage({
@@ -155,6 +158,7 @@ export class DetailsBusinessListingComponent {
  save() {
    this.listing.favoritesForUser.push(this.user.email);
    this.listingsService.save(this.listing, 'business');
+    this.auditService.createEvent(this.listing.id, 'favorite', this.user?.email);
  }
  isAlreadyFavorite() {
    return this.listing.favoritesForUser.includes(this.user.email);
@@ -169,6 +173,7 @@ export class DetailsBusinessListingComponent {
      type: 'business',
    });
    if (result) {
+      this.auditService.createEvent(this.listing.id, 'email', this.user?.email);
      this.messageService.addMessage({
        severity: 'success',
        text: 'Your Email has beend sent',
@@ -176,4 +181,8 @@ export class DetailsBusinessListingComponent {
      });
    }
  }
+
+  createEvent(eventType: EventTypeEnum) {
+    this.auditService.createEvent(this.listing.id, eventType, this.user?.email);
+  }
 }
--- a/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.html
+++ b/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.html
@@ -39,7 +39,7 @@
              </button>
            </div>
            }
-            <share-button button="print" showText="true"></share-button>
+            <share-button button="print" showText="true" (click)="createEvent('print')"></share-button>
            <!-- <share-button button="email" showText="true"></share-button> -->
            <div class="inline">
              <button class="share share-email text-white font-bold text-xs py-1.5 px-2 inline-flex items-center" (click)="showShareByEMail()">
@@ -48,9 +48,9 @@
              </button>
            </div>

-            <share-button button="facebook" showText="true"></share-button>
-            <share-button button="x" showText="true"></share-button>
-            <share-button button="linkedin" showText="true"></share-button>
+            <share-button button="facebook" showText="true" (click)="createEvent('facebook')"></share-button>
+            <share-button button="x" showText="true" (click)="createEvent('x')"></share-button>
+            <share-button button="linkedin" showText="true" (click)="createEvent('linkedin')"></share-button>
          </div>
        </div>

@@ -73,7 +73,7 @@
                <app-validated-input label="Your Email" name="email" [(ngModel)]="mailinfo.sender.email" kind="email"></app-validated-input>
              </div>
              <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                <app-validated-input label="Phone Number" name="phoneNumber" [(ngModel)]="mailinfo.sender.phoneNumber" kind="tel" mask="(000) 000-0000"></app-validated-input>
+                <app-validated-input label="Phone Number" name="phoneNumber" [(ngModel)]="mailinfo.sender.phoneNumber" mask="(000) 000-0000"></app-validated-input>
                <!-- <app-validated-input label="Country/State" name="state" [(ngModel)]="mailinfo.sender.state"></app-validated-input> -->
                <app-validated-ng-select label="State" name="state" [(ngModel)]="mailinfo.sender.state" [items]="selectOptions?.states"></app-validated-ng-select>
              </div>
--- a/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.ts
+++ b/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.ts
@@ -6,7 +6,7 @@ import { KeycloakService } from 'keycloak-angular';
 import { GalleryModule, ImageItem } from 'ng-gallery';
 import { ShareButton } from 'ngx-sharebuttons/button';
 import { lastValueFrom } from 'rxjs';
-import { CommercialPropertyListing, User } from '../../../../../../bizmatch-server/src/models/db.model';
+import { CommercialPropertyListing, EventTypeEnum, User } from '../../../../../../bizmatch-server/src/models/db.model';
 import { CommercialPropertyListingCriteria, ErrorResponse, KeycloakUser, MailInfo } from '../../../../../../bizmatch-server/src/models/main.model';
 import { environment } from '../../../../environments/environment';
 import { EMailService } from '../../../components/email/email.service';
@@ -97,6 +97,7 @@ export class DetailsCommercialPropertyListingComponent {
    }
    try {
      this.listing = (await lastValueFrom(this.listingsService.getListingById(this.id, 'commercialProperty'))) as CommercialPropertyListing;
+      this.auditService.createEvent(this.listing.id, 'view', this.user?.email);
      this.listingUser = await this.userService.getByMail(this.listing.email);
      this.description = this.sanitizer.bypassSecurityTrustHtml(this.listing.description);
      import('flowbite').then(flowbite => {
@@ -142,6 +143,7 @@ export class DetailsCommercialPropertyListingComponent {
      this.mailinfo.email = this.listingUser.email;
      this.mailinfo.listing = this.listing;
      await this.mailService.mail(this.mailinfo);
+      this.auditService.createEvent(this.listing.id, 'contact', this.user?.email);
      this.messageService.addMessage({ severity: 'success', text: 'Your message has been sent to the creator of the listing', duration: 3000 });
    } catch (error) {
      this.messageService.addMessage({
@@ -166,6 +168,7 @@ export class DetailsCommercialPropertyListingComponent {
  save() {
    this.listing.favoritesForUser.push(this.user.email);
    this.listingsService.save(this.listing, 'commercialProperty');
+    this.auditService.createEvent(this.listing.id, 'favorite', this.user?.email);
  }
  isAlreadyFavorite() {
    return this.listing.favoritesForUser.includes(this.user.email);
@@ -180,6 +183,7 @@ export class DetailsCommercialPropertyListingComponent {
      type: 'commercialProperty',
    });
    if (result) {
+      this.auditService.createEvent(this.listing.id, 'email', this.user?.email);
      this.messageService.addMessage({
        severity: 'success',
        text: 'Your Email has beend sent',
@@ -187,4 +191,7 @@ export class DetailsCommercialPropertyListingComponent {
      });
    }
  }
+  createEvent(eventType: EventTypeEnum) {
+    this.auditService.createEvent(this.listing.id, eventType, this.user?.email);
+  }
 }
--- a/bizmatch/src/app/pages/subscription/edit-business-listing/edit-business-listing.component.html
+++ b/bizmatch/src/app/pages/subscription/edit-business-listing/edit-business-listing.component.html
@@ -117,15 +117,8 @@
        </div>
      </div> -->
      <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-        <app-validated-input
-          label="Years Established Since"
-          name="established"
-          [(ngModel)]="listing.established"
-          kind="number"
-          mask="0000"
-          (ngModelChange)="onNumericInputChange($event, 'listing.established')"
-        ></app-validated-input>
-        <app-validated-input label="Employees" name="employees" [(ngModel)]="listing.employees" kind="number" mask="0000" (ngModelChange)="onNumericInputChange($event, 'listing.employees')"></app-validated-input>
+        <app-validated-input label="Established In" name="established" [(ngModel)]="listing.established" mask="0000" kind="number"></app-validated-input>
+        <app-validated-input label="Employees" name="employees" [(ngModel)]="listing.employees" mask="0000" kind="number"></app-validated-input>
      </div>

      <div class="flex mb-4 space-x-4">
@@ -199,13 +192,7 @@
          </ng-select>
        </div>
        <!-- } -->
-        <app-validated-input
-          label="Internal Listing Number"
-          name="internalListingNumber"
-          [(ngModel)]="listing.internalListingNumber"
-          kind="number"
-          (ngModelChange)="onNumericInputChange($event, 'listing.internalListingNumber')"
-        ></app-validated-input>
+        <app-validated-input label="Internal Listing Number" name="internalListingNumber" [(ngModel)]="listing.internalListingNumber" kind="number" mask="00000000000000000000"></app-validated-input>
      </div>

      <!-- <div class="mb-4">
--- a/bizmatch/src/app/pages/subscription/email-us/email-us.component.html
+++ b/bizmatch/src/app/pages/subscription/email-us/email-us.component.html
@@ -7,7 +7,7 @@
        <app-validated-input label="Your Email" name="email" [(ngModel)]="mailinfo.sender.email" kind="email"></app-validated-input>
      </div>
      <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-        <app-validated-input label="Phone Number" name="phoneNumber" [(ngModel)]="mailinfo.sender.phoneNumber" kind="tel" mask="(000) 000-0000"></app-validated-input>
+        <app-validated-input label="Phone Number" name="phoneNumber" [(ngModel)]="mailinfo.sender.phoneNumber" mask="(000) 000-0000"></app-validated-input>
        <div>
          <app-validated-ng-select label="State" name="state" [(ngModel)]="mailinfo.sender.state" [items]="selectOptions?.states"></app-validated-ng-select>
        </div>