itlab-internal-services 2.14.3 → 2.14.4

package/dist/models/account-entity.model.d.ts

@@ -4,12 +4,12 @@
 export declare class AccountEntity {
     /** Unique identifier for the account */
     id: string;
-    /** Array of permissions for the account */
-    perms: string[];
-    /** Username of the account */
-    username: string;
     /** Email of the account */
     email: string;
+    /** Username of the account */
+    username: string;
     /** Optional: Avatar of the account */
     avatar?: string;
+    /** Array of permissions for the account */
+    perms: string[];
 }

package/dist/models/account-entity.model.js

@@ -22,18 +22,18 @@ __decorate([
     __metadata("design:type", String)
 ], AccountEntity.prototype, "id", void 0);
 __decorate([
-    (0, swagger_1.ApiProperty)({ description: 'Array of permissions for the account', example: ['news.publish'] }),
-    __metadata("design:type", Array)
-], AccountEntity.prototype, "perms", void 0);
+    (0, swagger_1.ApiProperty)({ description: 'Email of the account', example: 'timo@example.com' }),
+    __metadata("design:type", String)
+], AccountEntity.prototype, "email", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)({ description: 'Username of the account', example: 'Timo S.' }),
     __metadata("design:type", String)
 ], AccountEntity.prototype, "username", void 0);
-__decorate([
-    (0, swagger_1.ApiProperty)({ description: 'Email of the account', example: 'timo@example.com' }),
-    __metadata("design:type", String)
-], AccountEntity.prototype, "email", void 0);
 __decorate([
     (0, swagger_1.ApiPropertyOptional)({ description: 'Avatar of the account', example: 'https://example.com/avatar.jpg' }),
     __metadata("design:type", String)
 ], AccountEntity.prototype, "avatar", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({ description: 'Array of permissions for the account', example: ['news.publish'] }),
+    __metadata("design:type", Array)
+], AccountEntity.prototype, "perms", void 0);

package/dist/modules/comment/comment-module-options.interface.d.ts

@@ -1,7 +1,10 @@
 import { ModelDefinition } from '@nestjs/mongoose';
+import { Document } from 'mongoose';
 import { HubResource } from '../../hub-resource.enum';
-export interface CommentModuleOptions {
+export interface CommentModuleOptions<T extends Document = any> {
     resource: HubResource;
-    model?: ModelDefinition;
     suffix?: string[];
+    model?: ModelDefinition;
+    ownerIdField?: keyof Omit<T, keyof Document>;
+    ownerIdsField?: keyof Omit<T, keyof Document>;
 }

package/dist/modules/comment/comment.module.d.ts

@@ -1,4 +1,5 @@
 import { DynamicModule } from '@nestjs/common';
+import { Document } from 'mongoose';
 import { CommentModuleOptions } from './comment-module-options.interface';
 /**
  * @class CommentModule
@@ -6,5 +7,5 @@ import { CommentModuleOptions } from './comment-module-options.interface';
  * @author Timo Scheuermann
  */
 export declare class CommentModule {
-    static register(options: CommentModuleOptions): DynamicModule;
+    static register<T extends Document = any>(options: CommentModuleOptions<T>): DynamicModule;
 }

package/dist/modules/comment/comment.module.js

@@ -39,9 +39,11 @@ let CommentModule = CommentModule_1 = class CommentModule {
             controllers: [CommentController],
             providers: [
                 comment_service_1.CommentService,
-                { provide: 'COMMENT_RESOURCE', useValue: options.resource },
                 { provide: 'COMMENT_MODEL', useValue: options.model.name },
                 { provide: 'COMMENT_SCHEMA', useValue: options.model.schema },
+                { provide: 'COMMENT_RESOURCE', useValue: options.resource },
+                { provide: 'COMMENT_RESOURCE_OWNER_ID_FIELD', useValue: options.ownerIdField },
+                { provide: 'COMMENT_RESOURCE_OWNER_IDS_FIELD', useValue: options.ownerIdsField },
             ],
             exports: [comment_service_1.CommentService],
         };

package/dist/modules/comment/comment.service.d.ts

@@ -10,25 +10,26 @@ import { AuthOptions } from '../authentication';
  * @author Timo Scheuermann
  */
 export declare class CommentService {
+    private readonly configService;
     private readonly authOptions;
     private readonly connection;
+    private readonly resource;
     private readonly model;
     private readonly schema;
-    private readonly resource;
-    private readonly configService;
+    private readonly ownerIdField;
+    private readonly ownerIdsField;
     /** The CommentService logger */
     private readonly logger;
     /**
      * @constructor Constructor for the CommentService class
-     * @param {Connection} connection - the database connection
+     * @param {ConfigService} configService - the config service
+     * @param {HubResource} resource - the resource used
      * @param {string} model - the model name
      * @param {string} schema - the schema
-     * @param {HubResource} resource - the resource used
-     * @param {ConfigService} configService - the config service
+     * @param {string} ownerId - the ownerId attr of the resource
+     * @param {string} ownerIds - the ownerIds attr of the resource
      */
-    constructor(authOptions: AuthOptions, connection: Connection, model: string | undefined, schema: Schema<{
-        _url: string;
-    }> | undefined, resource: HubResource, configService: ConfigService);
+    constructor(configService: ConfigService, authOptions: AuthOptions, connection: Connection | undefined, resource: HubResource, model: string | undefined, schema: Schema<any> | undefined, ownerIdField: string | undefined, ownerIdsField: string | undefined);
     private get baseUrl();
     /** The axios instance */
     private axios;
@@ -37,7 +38,7 @@ export declare class CommentService {
      *
      * @return {Model<{}> | undefined} The model retrieved from the connection.
      */
-    private getModel;
+    private get resourceModel();
     /**
      * Post a comment to a specific resource.
      *

package/dist/modules/comment/comment.service.js

@@ -39,19 +39,22 @@ const authentication_1 = require("../authentication");
 let CommentService = CommentService_1 = class CommentService {
     /**
      * @constructor Constructor for the CommentService class
-     * @param {Connection} connection - the database connection
+     * @param {ConfigService} configService - the config service
+     * @param {HubResource} resource - the resource used
      * @param {string} model - the model name
      * @param {string} schema - the schema
-     * @param {HubResource} resource - the resource used
-     * @param {ConfigService} configService - the config service
+     * @param {string} ownerId - the ownerId attr of the resource
+     * @param {string} ownerIds - the ownerIds attr of the resource
      */
-    constructor(authOptions, connection, model, schema, resource, configService) {
+    constructor(configService, authOptions, connection, resource, model, schema, ownerIdField, ownerIdsField) {
+        this.configService = configService;
         this.authOptions = authOptions;
         this.connection = connection;
+        this.resource = resource;
         this.model = model;
         this.schema = schema;
-        this.resource = resource;
-        this.configService = configService;
+        this.ownerIdField = ownerIdField;
+        this.ownerIdsField = ownerIdsField;
         /** The CommentService logger */
         this.logger = new common_1.Logger(CommentService_1.name);
         /** The axios instance */
@@ -71,10 +74,9 @@ let CommentService = CommentService_1 = class CommentService {
      *
      * @return {Model<{}> | undefined} The model retrieved from the connection.
      */
-    getModel() {
+    get resourceModel() {
         if (!(this.model && this.schema))
             return undefined;
-        this.logger.debug('Current DB', this.connection.db.databaseName);
         return this.connection.model(this.model, this.schema);
     }
     /**
@@ -88,17 +90,19 @@ let CommentService = CommentService_1 = class CommentService {
     postComment(resourceId, accountId, comment) {
         return __awaiter(this, void 0, void 0, function* () {
             // CommentModel is null inside manager modules
-            if (!(0, class_validator_1.isDefined)(this.getModel())) {
+            if (!(0, class_validator_1.isDefined)(this.resourceModel)) {
                 this.logger.error('Kommentare können nicht vom Management aus erstellt werden');
                 return;
             }
-            const exists = yield this.getModel().findOne({ _id: resourceId });
-            if (!exists)
+            const resource = yield this.resourceModel.findOne({ _id: resourceId });
+            if (!resource)
                 throw new common_1.NotFoundException('Kommentar konnte nicht erstellt werden');
+            const ownerId = this.ownerIdField ? resource[this.ownerIdField] : undefined;
+            const ownerIds = this.ownerIdsField ? resource[this.ownerIdsField] : undefined;
             this.logger.log(`Posting comment for ${this.resource} (${resourceId}) by ${accountId}`);
             return new Promise((resolve, reject) => {
                 this.axios
-                    .post(`${this.resource}/${resourceId}/${accountId}`, comment)
+                    .post(`${this.resource}/${resourceId}/${accountId}`, comment, { params: { ownerId, ownerIds } })
                     .then(({ data }) => {
                     this.logger.log(`Comment for ${this.resource} (${resourceId}) posted`);
                     resolve(data);
@@ -127,12 +131,16 @@ let CommentService = CommentService_1 = class CommentService {
 exports.CommentService = CommentService;
 exports.CommentService = CommentService = CommentService_1 = __decorate([
     (0, common_1.Injectable)(),
-    __param(0, (0, authentication_1.InjectAuthOptions)()),
-    __param(1, (0, mongoose_1.InjectConnection)()),
-    __param(2, (0, common_1.Optional)()),
-    __param(2, (0, common_1.Inject)('COMMENT_MODEL')),
-    __param(3, (0, common_1.Optional)()),
-    __param(3, (0, common_1.Inject)('COMMENT_SCHEMA')),
-    __param(4, (0, common_1.Inject)('COMMENT_RESOURCE')),
-    __metadata("design:paramtypes", [Object, mongoose_2.Connection, String, mongoose_2.Schema, String, config_1.ConfigService])
+    __param(1, (0, authentication_1.InjectAuthOptions)()),
+    __param(2, (0, mongoose_1.InjectConnection)()),
+    __param(3, (0, common_1.Inject)('COMMENT_RESOURCE')),
+    __param(4, (0, common_1.Optional)()),
+    __param(4, (0, common_1.Inject)('COMMENT_MODEL')),
+    __param(5, (0, common_1.Optional)()),
+    __param(5, (0, common_1.Inject)('COMMENT_SCHEMA')),
+    __param(6, (0, common_1.Optional)()),
+    __param(6, (0, common_1.Inject)('COMMENT_RESOURCE_OWNER_ID_FIELD')),
+    __param(7, (0, common_1.Optional)()),
+    __param(7, (0, common_1.Inject)('COMMENT_RESOURCE_OWNER_IDS_FIELD')),
+    __metadata("design:paramtypes", [config_1.ConfigService, Object, mongoose_2.Connection, String, String, mongoose_2.Schema, String, String])
 ], CommentService);

package/dist/modules/like/like.service.d.ts

@@ -23,7 +23,7 @@ export declare class LikeService {
      *
      * @return {Model<{}>} The model retrieved from the connection.
      */
-    private getModel;
+    private get resourceModel();
     /**
      * Get the number of likes for the specified resource
      *

package/dist/modules/like/like.service.js

@@ -50,9 +50,7 @@ let LikeService = LikeService_1 = class LikeService {
      *
      * @return {Model<{}>} The model retrieved from the connection.
      */
-    getModel() {
-        if (!this.model)
-            return undefined;
+    get resourceModel() {
         return this.connection.model(this.model, this.schema);
     }
     /**
@@ -76,7 +74,7 @@ let LikeService = LikeService_1 = class LikeService {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.log(`Adding like to ${resourceId} by ${accountId}`);
             // Find the resource and update the likedBy array by adding the accountId
-            const resource = yield this.getModel().findOneAndUpdate({ _id: resourceId }, { $addToSet: { _likedBy: accountId } }, { upsert: false, new: true, timestamps: false });
+            const resource = yield this.resourceModel.findOneAndUpdate({ _id: resourceId }, { $addToSet: { _likedBy: accountId } }, { upsert: false, new: true, timestamps: false });
             // Return the like count after the addition
             return this.likeCount(resource);
         });
@@ -92,7 +90,7 @@ let LikeService = LikeService_1 = class LikeService {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.log(`Removing like from ${resourceId} by ${accountId}`);
             // Find the resource and update the _likedBy array by removing the accountId
-            const resource = yield this.getModel().findOneAndUpdate({ _id: resourceId }, { $pull: { _likedBy: { $in: [accountId] } } }, { upsert: false, new: true, timestamps: false });
+            const resource = yield this.resourceModel.findOneAndUpdate({ _id: resourceId }, { $pull: { _likedBy: { $in: [accountId] } } }, { upsert: false, new: true, timestamps: false });
             // Return the like count after the removal
             return this.likeCount(resource);
         });
@@ -108,7 +106,7 @@ let LikeService = LikeService_1 = class LikeService {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.log(`Check if ${accountId} has liked ${resourceId}`);
             // Find the resource in the likeModel with the provided resourceId.
-            const resource = yield this.getModel().findOne({ _id: resourceId });
+            const resource = yield this.resourceModel.findOne({ _id: resourceId });
             // Return true if the resource exists and has the account in its _likedBy array, otherwise return false.
             return resource && resource._likedBy ? resource._likedBy.includes(accountId) : false;
         });

package/package.json

@@ -5,7 +5,7 @@
     "email": "timo.scheuermann@sv-informatik.de",
     "url": "https://timos.design"
   },
-  "version": "2.14.3",
+  "version": "2.14.4",
   "type": "commonjs",
   "files": [
     "dist"