@social-mail/social-mail-web-server 1.7.612 → 1.7.615

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.612",
+  "version": "1.7.615",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/model/entities/WebSiteTag.ts

@@ -3,6 +3,7 @@ import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js
 import Table from "@entity-access/entity-access/dist/decorators/Table.js";
 import WebSite from "./WebSite.js";
 import Tag from "./Tag.js";
+import { JsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
 
 @Table("WebSiteTags")
 export default class WebSiteTag {
@@ -32,4 +33,7 @@ export default class WebSiteTag {
     tag: Tag;
     webSite: WebSite;
 
+    @JsonProperty({})
+    name: string;
+
 }

package/src/server/model/events/WebSiteTagEvents.ts

@@ -2,9 +2,15 @@ import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWit
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import WebSiteTag from "../entities/WebSiteTag.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
+import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
+import Inject from "@entity-access/entity-access/dist/di/di.js";
+import TagService from "../../services/tags/TagService.js";
 
 export default class WebSiteTagEvents extends AuthenticatedEvents<WebSiteTag> {
 
+    @Inject
+    tagService: TagService;
+
     filter(query: IEntityQuery<WebSiteTag>): IEntityQuery<WebSiteTag> {
 
         const { sessionUser } = this;
@@ -23,4 +29,11 @@ export default class WebSiteTagEvents extends AuthenticatedEvents<WebSiteTag> {
         return query;
     }
 
+    async beforeInsert(entity: WebSiteTag, entry: ChangeEntry<WebSiteTag>) {
+        if (!entity.tagID) {
+            const name = entity.name;
+            entity.tagID = (await this.tagService.getTagID(name))[0];
+        }
+    }
+
 }