itlab-internal-services 2.4.0 → 2.4.2

package/dist/guards/perms.guard.js

@@ -50,7 +50,7 @@ let PermsGuard = class PermsGuard {
         // Retrieve the user from the request
         const { user } = ctx.switchToHttp().getRequest();
         // Check if the user is valid and has at least one permission
-        const userValid = user && (0, class_validator_1.minLength)(user.perms, 1);
+        const userValid = user && (0, class_validator_1.arrayMinSize)(user.perms, 1);
         // If the user is valid and has the required permissions, allow access
         if (userValid && (0, itlab_functions_1.hasPermission)(perms, user.perms))
             return true;

package/dist/modules/comment/comment.controller.js

@@ -61,7 +61,7 @@ __decorate([
     (0, swagger_1.ApiBody)({ description: 'Der zu speichernde Kommentar' }),
     (0, exceptions_1.ApiBadBody)('Validierung des Kommentars fehlgeschlagen'),
     (0, pipes_1.ApiId)('targetId'),
-    (0, common_1.Post)(':targetId/comment'),
+    (0, common_1.Post)(':targetId'),
     __param(0, (0, pipes_1.Id)('targetId')),
     __param(1, (0, authentication_1.Account)('id')),
     __param(2, (0, common_1.Body)()),
@@ -71,8 +71,6 @@ __decorate([
 ], CommentController.prototype, "postComment", null);
 CommentController = __decorate([
     (0, authentication_1.Jwt)(),
-    (0, swagger_1.ApiTags)('Comment'),
-    (0, common_1.Controller)(''),
     __metadata("design:paramtypes", [comment_service_1.CommentService])
 ], CommentController);
 exports.CommentController = CommentController;

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

@@ -1,5 +1,5 @@
 import { DynamicModule } from '@nestjs/common';
-import { Schema } from 'mongoose';
+import { ModelDefinition } from '@nestjs/mongoose';
 import { Targets } from '../../pipes';
 /**
  * @class CommentModule
@@ -10,10 +10,10 @@ export declare class CommentModule {
     /**
      * Generate a CommentModule based on the given schema.
      *
-     * @param {Schema} schema - the schema for the CommentModule
-     * @param {string | string[]} prefix - the prefix for the CommentController (Defaults to "comment")
+     * @param {ModelDefinition} model - the model
+     * @param {string | string[]} suffix - additional suffix for the CommentController (Defaults to "")
      * @return {DynamicModule} the CommentModule generated for the given schema
      */
-    static forFeature(schema: Schema, target: Targets, prefix?: string): DynamicModule;
+    static forFeature(model: ModelDefinition, target: Targets, ...suffix: string[]): DynamicModule;
     static register(target: Targets): DynamicModule;
 }

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

@@ -8,7 +8,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommentModule = void 0;
 const common_1 = require("@nestjs/common");
-const mongoose_1 = require("@nestjs/mongoose");
+const swagger_1 = require("@nestjs/swagger");
+const itlab_functions_1 = require("itlab-functions");
 const comment_controller_1 = require("./comment.controller");
 const comment_service_1 = require("./comment.service");
 /**
@@ -20,23 +21,28 @@ class CommentModule {
     /**
      * Generate a CommentModule based on the given schema.
      *
-     * @param {Schema} schema - the schema for the CommentModule
-     * @param {string | string[]} prefix - the prefix for the CommentController (Defaults to "comment")
+     * @param {ModelDefinition} model - the model
+     * @param {string | string[]} suffix - additional suffix for the CommentController (Defaults to "")
      * @return {DynamicModule} the CommentModule generated for the given schema
      */
-    static forFeature(schema, target, prefix) {
+    static forFeature(model, target, ...suffix) {
         let CommentController = class CommentController extends comment_controller_1.CommentController {
         };
         CommentController = __decorate([
-            (0, common_1.Controller)(prefix)
+            (0, swagger_1.ApiTags)(['Comment Module', ...suffix.map(itlab_functions_1.capitalize)].join(' - ')),
+            (0, common_1.Controller)(['comment', ...suffix].join('/'))
         ], CommentController);
         let CommentModuleTemplate = class CommentModuleTemplate {
         };
         CommentModuleTemplate = __decorate([
             (0, common_1.Module)({
-                imports: [mongoose_1.MongooseModule.forFeature([{ name: 'COMMENT_SCHEMA', schema }])],
                 controllers: [CommentController],
-                providers: [comment_service_1.CommentService, { provide: 'COMMENT_TARGET', useValue: target }],
+                providers: [
+                    comment_service_1.CommentService,
+                    { provide: 'COMMENT_TARGET', useValue: target },
+                    { provide: 'COMMENT_MODEL', useValue: model.name },
+                    { provide: 'COMMENT_SCHEMA', useValue: model.schema },
+                ],
                 exports: [comment_service_1.CommentService],
             })
         ], CommentModuleTemplate);

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

@@ -1,6 +1,6 @@
 import { ConfigService } from '@nestjs/config';
 import { ContentRichtext } from 'itlab-functions';
-import { Model } from 'mongoose';
+import { Connection, Schema } from 'mongoose';
 import { Targets } from '../../pipes';
 import { Comment } from './comment.module-options';
 /**
@@ -9,20 +9,32 @@ import { Comment } from './comment.module-options';
  * @author Timo Scheuermann
  */
 export declare class CommentService {
-    private readonly commentModel;
+    private readonly connection;
+    private readonly model;
+    private readonly schema;
     private readonly target;
     private readonly configService;
     /** The CommentService logger */
     private readonly logger;
     /**
      * @constructor Constructor for the CommentService class
-     * @param commentModel - The injected model for the COMMENT_SCHEMA
-     * @param target - The target for which comments are being posted
-     * @param configService - The injected config service
+     * @param {Connection} connection - the database connection
+     * @param {string} model - the model name
+     * @param {string} schema - the schema
+     * @param {Targets} target - the target
+     * @param {ConfigService} configService - the config service
      */
-    constructor(commentModel: Model<{}> | null, target: Targets, configService: ConfigService);
+    constructor(connection: Connection, model: string | undefined, schema: Schema<{
+        _url: string;
+    }>, target: Targets, configService: ConfigService);
     /** The axios instance */
     private axios;
+    /**
+     * Retrieve the model from the connection based on the schema name.
+     *
+     * @return {Model<{}> | undefined} The model retrieved from the connection.
+     */
+    private getModel;
     /**
      * Post a comment to a specific target.
      *

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

@@ -40,12 +40,16 @@ const pipes_1 = require("../../pipes");
 let CommentService = CommentService_1 = class CommentService {
     /**
      * @constructor Constructor for the CommentService class
-     * @param commentModel - The injected model for the COMMENT_SCHEMA
-     * @param target - The target for which comments are being posted
-     * @param configService - The injected config service
+     * @param {Connection} connection - the database connection
+     * @param {string} model - the model name
+     * @param {string} schema - the schema
+     * @param {Targets} target - the target
+     * @param {ConfigService} configService - the config service
      */
-    constructor(commentModel, target, configService) {
-        this.commentModel = commentModel;
+    constructor(connection, model, schema, target, configService) {
+        this.connection = connection;
+        this.model = model;
+        this.schema = schema;
         this.target = target;
         this.configService = configService;
         /** The CommentService logger */
@@ -56,6 +60,17 @@ let CommentService = CommentService_1 = class CommentService {
             k8sToken: this.configService.getOrThrow(env_1.ENV_K8S_TOKEN),
         });
     }
+    /**
+     * Retrieve the model from the connection based on the schema name.
+     *
+     * @return {Model<{}> | undefined} The model retrieved from the connection.
+     */
+    getModel() {
+        if (!(this.model && this.schema))
+            return undefined;
+        this.logger.debug('Current DB', this.connection.db.databaseName);
+        return this.connection.model(this.model, this.schema);
+    }
     /**
      * Post a comment to a specific target.
      *
@@ -67,11 +82,11 @@ let CommentService = CommentService_1 = class CommentService {
     postComment(targetId, accountId, comment) {
         return __awaiter(this, void 0, void 0, function* () {
             // CommentModel is null inside manager modules
-            if (!(0, class_validator_1.isDefined)(this.commentModel)) {
+            if (!(0, class_validator_1.isDefined)(this.getModel())) {
                 this.logger.error('Kommentare können nicht vom Management aus erstell werden');
                 return;
             }
-            const exists = yield this.commentModel.findOne({ _id: targetId });
+            const exists = yield this.getModel().findOne({ _id: targetId });
             if (!exists)
                 throw new exceptions_1.NotFoundException('Kommentar konnte nicht erstellt werden');
             this.logger.log(`Posting comment for ${this.target} (${targetId}) by ${accountId}`);
@@ -105,9 +120,12 @@ let CommentService = CommentService_1 = class CommentService {
 };
 CommentService = CommentService_1 = __decorate([
     (0, common_1.Injectable)(),
-    __param(0, (0, common_1.Optional)()),
-    __param(0, (0, mongoose_1.InjectModel)('COMMENT_SCHEMA')),
-    __param(1, (0, common_1.Inject)('COMMENT_TARGET')),
-    __metadata("design:paramtypes", [mongoose_2.Model, String, config_1.ConfigService])
+    __param(0, (0, mongoose_1.InjectConnection)()),
+    __param(1, (0, common_1.Optional)()),
+    __param(1, (0, common_1.Inject)('COMMENT_MODEL')),
+    __param(2, (0, common_1.Optional)()),
+    __param(2, (0, common_1.Inject)('COMMENT_SCHEMA')),
+    __param(3, (0, common_1.Inject)('COMMENT_TARGET')),
+    __metadata("design:paramtypes", [mongoose_2.Connection, String, mongoose_2.Schema, String, config_1.ConfigService])
 ], CommentService);
 exports.CommentService = CommentService;

package/dist/modules/like/like.controller.js

@@ -112,8 +112,6 @@ __decorate([
 ], LikeController.prototype, "hasLiked", null);
 LikeController = __decorate([
     (0, authentication_1.Jwt)(),
-    (0, swagger_1.ApiTags)('Like'),
-    (0, common_1.Controller)('like'),
     __metadata("design:paramtypes", [like_service_1.LikeService])
 ], LikeController);
 exports.LikeController = LikeController;

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

@@ -1,6 +1,5 @@
 import { DynamicModule } from '@nestjs/common';
-import { Schema } from 'mongoose';
-import { LikeableDocument } from './like.module-options';
+import { ModelDefinition } from '@nestjs/mongoose';
 /**
  * @class LikeModule
  * @description This module handles all operations related to likes.
@@ -10,9 +9,9 @@ export declare class LikeModule {
     /**
      * Generate a LikeModule based on the given schema.
      *
-     * @param {Schema<LikeableDocument>} schema - the schema for the LikeModule
-     * @param {string | string[]} prefix - the prefix for the LikeController (Defaults to "like")
+     * @param {ModelDefinition} model - the model
+     * @param {string | string[]} suffix - additional suffix for the LikeController (Defaults to "")
      * @return {DynamicModule} the LikeModule generated for the given schema
      */
-    static forFeature(schema: Schema<LikeableDocument>, ...prefix: string[]): DynamicModule;
+    static forFeature(model: ModelDefinition, ...suffix: string[]): DynamicModule;
 }

package/dist/modules/like/like.module.js

@@ -8,7 +8,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LikeModule = void 0;
 const common_1 = require("@nestjs/common");
-const mongoose_1 = require("@nestjs/mongoose");
+const swagger_1 = require("@nestjs/swagger");
+const itlab_functions_1 = require("itlab-functions");
 const like_controller_1 = require("./like.controller");
 const like_service_1 = require("./like.service");
 /**
@@ -20,23 +21,28 @@ class LikeModule {
     /**
      * Generate a LikeModule based on the given schema.
      *
-     * @param {Schema<LikeableDocument>} schema - the schema for the LikeModule
-     * @param {string | string[]} prefix - the prefix for the LikeController (Defaults to "like")
+     * @param {ModelDefinition} model - the model
+     * @param {string | string[]} suffix - additional suffix for the LikeController (Defaults to "")
      * @return {DynamicModule} the LikeModule generated for the given schema
      */
-    static forFeature(schema, ...prefix) {
+    static forFeature(model, ...suffix) {
         let LikeController = class LikeController extends like_controller_1.LikeController {
         };
         LikeController = __decorate([
-            (0, common_1.Controller)(prefix.concat('like').join('/'))
+            (0, swagger_1.ApiTags)(['Like Module', ...suffix.map(itlab_functions_1.capitalize)].join(' - ')),
+            (0, common_1.Controller)(['like', ...suffix].join('/'))
         ], LikeController);
         let LikeModuleTemplate = class LikeModuleTemplate {
         };
         LikeModuleTemplate = __decorate([
             (0, common_1.Module)({
-                imports: [mongoose_1.MongooseModule.forFeature([{ name: 'LIKE_SCHEMA', schema }])],
                 controllers: [LikeController],
-                providers: [like_service_1.LikeService],
+                providers: [
+                    like_service_1.LikeService,
+                    { provide: 'LIKE_MODEL', useValue: model.name },
+                    { provide: 'LIKE_SCHEMA', useValue: model.schema },
+                ],
+                exports: [like_service_1.LikeService],
             })
         ], LikeModuleTemplate);
         return { module: LikeModuleTemplate };

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

@@ -1,19 +1,31 @@
-import { Model } from 'mongoose';
-import { LikeableDocument } from './like.module-options';
+import { Connection, Schema } from 'mongoose';
 /**
  * @class LikeService
  * @description The LikeService class is responsible for handling likes for a specified target. It provides methods to add, remove, and check likes of a target.
  * @author Timo Scheuermann
  */
 export declare class LikeService {
-    private readonly likeModel;
+    private readonly connection;
+    private readonly model;
+    private readonly schema;
     /** The LikeService logger */
     private readonly logger;
     /**
      * @constructor Constructor for the LikeService class
-     * @param likeModel - The injected model for the LIKE_SCHEMA
+     * @param {Connection} connection - the database connection
+     * @param {string} model - the model name
+     * @param {Schema} schema - the schema
      */
-    constructor(likeModel: Model<LikeableDocument>);
+    constructor(connection: Connection, model: string, schema: Schema<{
+        _likedBy: string[];
+        _id: string;
+    }>);
+    /**
+     * Retrieve the model from the connection based on the schema name.
+     *
+     * @return {Model<{}>} The model retrieved from the connection.
+     */
+    private getModel;
     /**
      * Get the number of likes for the specified target
      *

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

@@ -34,13 +34,27 @@ const mongoose_2 = require("mongoose");
 let LikeService = LikeService_1 = class LikeService {
     /**
      * @constructor Constructor for the LikeService class
-     * @param likeModel - The injected model for the LIKE_SCHEMA
+     * @param {Connection} connection - the database connection
+     * @param {string} model - the model name
+     * @param {Schema} schema - the schema
      */
-    constructor(likeModel) {
-        this.likeModel = likeModel;
+    constructor(connection, model, schema) {
+        this.connection = connection;
+        this.model = model;
+        this.schema = schema;
         /** The LikeService logger */
         this.logger = new common_1.Logger(LikeService_1.name);
     }
+    /**
+     * Retrieve the model from the connection based on the schema name.
+     *
+     * @return {Model<{}>} The model retrieved from the connection.
+     */
+    getModel() {
+        if (!this.model)
+            return undefined;
+        return this.connection.model(this.model, this.schema);
+    }
     /**
      * Get the number of likes for the specified target
      *
@@ -62,7 +76,7 @@ let LikeService = LikeService_1 = class LikeService {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.log(`Adding like to ${targetId} by ${accountId}`);
             // Find the target and update the likedBy array by adding the accountId
-            const target = yield this.likeModel.findOneAndUpdate({ _id: targetId, draft: false }, { $addToSet: { _likedBy: accountId } }, { upsert: false, new: true });
+            const target = yield this.getModel().findOneAndUpdate({ _id: targetId, draft: false }, { $addToSet: { _likedBy: accountId } }, { upsert: false, new: true });
             // Return the like count after the addition
             return this.likeCount(target);
         });
@@ -78,7 +92,7 @@ let LikeService = LikeService_1 = class LikeService {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.log(`Removing like from ${targetId} by ${accountId}`);
             // Find the target and update the _likedBy array by removing the accountId
-            const target = yield this.likeModel.findOneAndUpdate({ _id: targetId, draft: false }, { $pull: { _likedBy: { $in: [accountId] } } }, { upsert: false, new: true });
+            const target = yield this.getModel().findOneAndUpdate({ _id: targetId, draft: false }, { $pull: { _likedBy: { $in: [accountId] } } }, { upsert: false, new: true });
             // Return the like count after the removal
             return this.likeCount(target);
         });
@@ -92,8 +106,9 @@ let LikeService = LikeService_1 = class LikeService {
      */
     hasLiked(targetId, accountId) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.logger.log(`Check if ${accountId} has liked ${targetId}`);
             // Find the target in the likeModel with the provided targetId and ensure it's not a draft.
-            const target = yield this.likeModel.findOne({ _id: targetId, draft: false });
+            const target = yield this.getModel().findOne({ _id: targetId, draft: false });
             // Return true if the target exists and has the account in its _likedBy array, otherwise return false.
             return target && target._likedBy ? target._likedBy.includes(accountId) : false;
         });
@@ -101,7 +116,9 @@ let LikeService = LikeService_1 = class LikeService {
 };
 LikeService = LikeService_1 = __decorate([
     (0, common_1.Injectable)(),
-    __param(0, (0, mongoose_1.InjectModel)('LIKE_SCHEMA')),
-    __metadata("design:paramtypes", [mongoose_2.Model])
+    __param(0, (0, mongoose_1.InjectConnection)()),
+    __param(1, (0, common_1.Inject)('LIKE_MODEL')),
+    __param(2, (0, common_1.Inject)('LIKE_SCHEMA')),
+    __metadata("design:paramtypes", [mongoose_2.Connection, String, mongoose_2.Schema])
 ], LikeService);
 exports.LikeService = LikeService;

package/package.json

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