@futdevpro/nts-dynamo 1.15.13 → 1.15.14

package/src/_modules/defaults/_services/default-user.data-service.spec.ts

@@ -1,187 +1,187 @@
-
-import { DyNTS_Default_User_DataService } from './default-user.data-service';
-import { DyNTS_Default_User } from '../_models/default-user.data-model';
-import { DyFM_EnvironmentFlag } from '@futdevpro/fsm-dynamo';
-import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
-import { DyNTS_GlobalService } from '../../../_services/core/global.service';
-
-describe('| DyNTS_Default_User_DataService', () => {
-  let service: DyNTS_Default_User_DataService;
-  let mockDBService: jasmine.SpyObj<{
-    findOne: (filter: unknown) => Promise<unknown>;
-    getDataById: (id: string) => Promise<unknown>;
-    modifyData: (data: unknown, issuer: string, dontUpdateModified?: boolean) => Promise<unknown>;
-  }>;
-
-  beforeEach(() => {
-    DyNTS_global_settings.env_settings = {
-      environment: DyFM_EnvironmentFlag.local,
-      mongoUri: 'mongodb://localhost:27017/test',
-      discord: { token: '', clientId: '', guildId: '', oauth2Url: '' },
-      openAi: { apiKey: '', organization: '', project: '', ttsApiKey: '' },
-    };
-
-    mockDBService = jasmine.createSpyObj('DyNTS_DBService', [
-      'findOne',
-      'getDataById',
-      'getDataListByIds',
-      'find',
-      'getAll',
-      'createData',
-      'modifyData',
-      'updateOne',
-      'markDeletedById',
-    ]);
-    spyOn(DyNTS_GlobalService, 'getDBService').and.returnValue(mockDBService as never);
-
-    service = new DyNTS_Default_User_DataService({
-      issuer: 'issuer-123',
-    });
-  });
-
-  it('| should create service with user', () => {
-    const user = new DyNTS_Default_User({
-      username: 'testuser',
-      email: 'test@example.com',
-      roles: [],
-      isActive: true,
-    });
-
-    const serviceWithUser = new DyNTS_Default_User_DataService({
-      user: user,
-      issuer: 'issuer-123',
-    });
-
-    expect(serviceWithUser).toBeInstanceOf(DyNTS_Default_User_DataService);
-    expect(serviceWithUser.data).toBeDefined();
-  });
-
-  it('| should create service without user', () => {
-    expect(service).toBeInstanceOf(DyNTS_Default_User_DataService);
-    expect(service.data).toBeDefined();
-  });
-
-  describe('| findByUsername', () => {
-    it('| should return null when user not found', async () => {
-      mockDBService.findOne.and.returnValue(Promise.resolve(null));
-
-      const result = await service.findByUsername('nonexistent');
-
-      expect(result).toBeNull();
-    });
-
-    it('| should return user when found', async () => {
-      const mockUser = new DyNTS_Default_User({
-        _id: 'user-123',
-        username: 'testuser',
-        email: 'test@example.com',
-        roles: [],
-        isActive: true,
-      });
-
-      mockDBService.findOne.and.returnValue(Promise.resolve(mockUser));
-
-      const result = await service.findByUsername('testuser');
-
-      expect(result).toBe(mockUser);
-      expect(service.data).toBe(mockUser);
-    });
-
-    it('| should throw error on database error', async () => {
-      mockDBService.findOne.and.returnValue(Promise.reject(new Error('Database error')));
-
-      await expectAsync(
-        service.findByUsername('testuser')
-      ).toBeRejected();
-    });
-  });
-
-  describe('| findByEmail', () => {
-    it('| should return null when user not found', async () => {
-      mockDBService.findOne.and.returnValue(Promise.resolve(null));
-
-      const result = await service.findByEmail('nonexistent@example.com');
-
-      expect(result).toBeNull();
-    });
-
-    it('| should return user when found', async () => {
-      const mockUser = new DyNTS_Default_User({
-        _id: 'user-123',
-        username: 'testuser',
-        email: 'test@example.com',
-        roles: [],
-        isActive: true,
-      });
-
-      mockDBService.findOne.and.returnValue(Promise.resolve(mockUser));
-
-      const result = await service.findByEmail('test@example.com');
-
-      expect(result).toBe(mockUser);
-      expect(service.data).toBe(mockUser);
-    });
-
-    it('| should throw error on database error', async () => {
-      mockDBService.findOne.and.returnValue(Promise.reject(new Error('Database error')));
-
-      await expectAsync(
-        service.findByEmail('test@example.com')
-      ).toBeRejected();
-    });
-  });
-
-  describe('| updateLastLogin', () => {
-    it('| should update last login timestamp', async () => {
-      const mockUser = new DyNTS_Default_User({
-        _id: 'user-123',
-        username: 'testuser',
-        email: 'test@example.com',
-        roles: [],
-        isActive: true,
-      });
-
-      spyOn(service, 'getDataById').and.returnValue(
-        Promise.resolve(mockUser)
-      );
-      spyOn(service, 'saveData').and.returnValue(Promise.resolve(mockUser));
-
-      await service.updateLastLogin('user-123');
-
-      expect(mockUser.lastLoginAt).toBeInstanceOf(Date);
-      expect(service.saveData).toHaveBeenCalledWith(mockUser);
-    });
-
-    it('| should throw error when user not found', async () => {
-      spyOn(service, 'getDataById').and.returnValue(
-        Promise.resolve(null)
-      );
-
-      await expectAsync(
-        service.updateLastLogin('nonexistent')
-      ).toBeRejected();
-    });
-
-    it('| should throw error on save error', async () => {
-      const mockUser = new DyNTS_Default_User({
-        _id: 'user-123',
-        username: 'testuser',
-        email: 'test@example.com',
-        roles: [],
-        isActive: true,
-      });
-
-      spyOn(service, 'getDataById').and.returnValue(
-        Promise.resolve(mockUser)
-      );
-      spyOn(service, 'saveData').and.returnValue(
-        Promise.reject(new Error('Save error'))
-      );
-
-      await expectAsync(
-        service.updateLastLogin('user-123')
-      ).toBeRejected();
-    });
-  });
-});
-
+
+import { DyNTS_Default_User_DataService } from './default-user.data-service';
+import { DyNTS_Default_User } from '../_models/default-user.data-model';
+import { DyFM_EnvironmentFlag } from '@futdevpro/fsm-dynamo';
+import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
+import { DyNTS_GlobalService } from '../../../_services/core/global.service';
+
+describe('| DyNTS_Default_User_DataService', () => {
+  let service: DyNTS_Default_User_DataService;
+  let mockDBService: jasmine.SpyObj<{
+    findOne: (filter: unknown) => Promise<unknown>;
+    getDataById: (id: string) => Promise<unknown>;
+    modifyData: (data: unknown, issuer: string, dontUpdateModified?: boolean) => Promise<unknown>;
+  }>;
+
+  beforeEach(() => {
+    DyNTS_global_settings.env_settings = {
+      environment: DyFM_EnvironmentFlag.local,
+      mongoUri: 'mongodb://localhost:27017/test',
+      discord: { token: '', clientId: '', guildId: '', oauth2Url: '' },
+      openAi: { apiKey: '', organization: '', project: '', ttsApiKey: '' },
+    };
+
+    mockDBService = jasmine.createSpyObj('DyNTS_DBService', [
+      'findOne',
+      'getDataById',
+      'getDataListByIds',
+      'find',
+      'getAll',
+      'createData',
+      'modifyData',
+      'updateOne',
+      'markDeletedById',
+    ]);
+    spyOn(DyNTS_GlobalService, 'getDBService').and.returnValue(mockDBService as never);
+
+    service = new DyNTS_Default_User_DataService({
+      issuer: 'issuer-123',
+    });
+  });
+
+  it('| should create service with user', () => {
+    const user = new DyNTS_Default_User({
+      username: 'testuser',
+      email: 'test@example.com',
+      roles: [],
+      isActive: true,
+    });
+
+    const serviceWithUser = new DyNTS_Default_User_DataService({
+      user: user,
+      issuer: 'issuer-123',
+    });
+
+    expect(serviceWithUser).toBeInstanceOf(DyNTS_Default_User_DataService);
+    expect(serviceWithUser.data).toBeDefined();
+  });
+
+  it('| should create service without user', () => {
+    expect(service).toBeInstanceOf(DyNTS_Default_User_DataService);
+    expect(service.data).toBeDefined();
+  });
+
+  describe('| findByUsername', () => {
+    it('| should return null when user not found', async () => {
+      mockDBService.findOne.and.returnValue(Promise.resolve(null));
+
+      const result = await service.findByUsername('nonexistent');
+
+      expect(result).toBeNull();
+    });
+
+    it('| should return user when found', async () => {
+      const mockUser = new DyNTS_Default_User({
+        _id: 'user-123',
+        username: 'testuser',
+        email: 'test@example.com',
+        roles: [],
+        isActive: true,
+      });
+
+      mockDBService.findOne.and.returnValue(Promise.resolve(mockUser));
+
+      const result = await service.findByUsername('testuser');
+
+      expect(result).toBe(mockUser);
+      expect(service.data).toBe(mockUser);
+    });
+
+    it('| should throw error on database error', async () => {
+      mockDBService.findOne.and.returnValue(Promise.reject(new Error('Database error')));
+
+      await expectAsync(
+        service.findByUsername('testuser')
+      ).toBeRejected();
+    });
+  });
+
+  describe('| findByEmail', () => {
+    it('| should return null when user not found', async () => {
+      mockDBService.findOne.and.returnValue(Promise.resolve(null));
+
+      const result = await service.findByEmail('nonexistent@example.com');
+
+      expect(result).toBeNull();
+    });
+
+    it('| should return user when found', async () => {
+      const mockUser = new DyNTS_Default_User({
+        _id: 'user-123',
+        username: 'testuser',
+        email: 'test@example.com',
+        roles: [],
+        isActive: true,
+      });
+
+      mockDBService.findOne.and.returnValue(Promise.resolve(mockUser));
+
+      const result = await service.findByEmail('test@example.com');
+
+      expect(result).toBe(mockUser);
+      expect(service.data).toBe(mockUser);
+    });
+
+    it('| should throw error on database error', async () => {
+      mockDBService.findOne.and.returnValue(Promise.reject(new Error('Database error')));
+
+      await expectAsync(
+        service.findByEmail('test@example.com')
+      ).toBeRejected();
+    });
+  });
+
+  describe('| updateLastLogin', () => {
+    it('| should update last login timestamp', async () => {
+      const mockUser = new DyNTS_Default_User({
+        _id: 'user-123',
+        username: 'testuser',
+        email: 'test@example.com',
+        roles: [],
+        isActive: true,
+      });
+
+      spyOn(service, 'getDataById').and.returnValue(
+        Promise.resolve(mockUser)
+      );
+      spyOn(service, 'saveData').and.returnValue(Promise.resolve(mockUser));
+
+      await service.updateLastLogin('user-123');
+
+      expect(mockUser.lastLoginAt).toBeInstanceOf(Date);
+      expect(service.saveData).toHaveBeenCalledWith(mockUser);
+    });
+
+    it('| should throw error when user not found', async () => {
+      spyOn(service, 'getDataById').and.returnValue(
+        Promise.resolve(null)
+      );
+
+      await expectAsync(
+        service.updateLastLogin('nonexistent')
+      ).toBeRejected();
+    });
+
+    it('| should throw error on save error', async () => {
+      const mockUser = new DyNTS_Default_User({
+        _id: 'user-123',
+        username: 'testuser',
+        email: 'test@example.com',
+        roles: [],
+        isActive: true,
+      });
+
+      spyOn(service, 'getDataById').and.returnValue(
+        Promise.resolve(mockUser)
+      );
+      spyOn(service, 'saveData').and.returnValue(
+        Promise.reject(new Error('Save error'))
+      );
+
+      await expectAsync(
+        service.updateLastLogin('user-123')
+      ).toBeRejected();
+    });
+  });
+});
+

package/src/_modules/defaults/_services/default-user.data-service.ts

@@ -1,98 +1,98 @@
-import { DyFM_Error, DyFM_DBFilter } from '@futdevpro/fsm-dynamo';
-import { DyNTS_DataService } from '../../../_services/base/data.service';
-import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
-import { DyNTS_Default_User, DyNTS_defaultUser_dataParams } from '../_models/default-user.data-model';
-
-/**
- * Default User Data Service
- * Handles CRUD operations for default users
- */
-export class DyNTS_Default_User_DataService extends DyNTS_DataService<DyNTS_Default_User> {
-  
-  constructor(
-    set: {
-      user?: DyNTS_Default_User;
-      issuer: string;
-    }
-  ) {
-    super(
-      new DyNTS_Default_User(set?.user),
-      DyNTS_defaultUser_dataParams,
-      set.issuer
-    );
-  }
-  
-  /**
-   * Find user by username
-   */
-  async findByUsername(username: string): Promise<DyNTS_Default_User | null> {
-    try {
-      await this.dataDBService
-        .findOne({ 
-          username, 
-          __deleted: { $exists: false } 
-        } as DyFM_DBFilter<DyNTS_Default_User>)
-        .then(res => {
-          if (res) {
-            this.data = res;
-          }
-        });
-      
-      return this.data._id ? this.data : null;
-    } catch (error) {
-      throw new DyFM_Error({
-        ...this.getDefaultErrorSettings('findByUsername', error),
-        errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-DEF-FBU`,
-        userMessage: 'Failed to find user by username.',
-      });
-    }
-  }
-  
-  /**
-   * Find user by email
-   */
-  async findByEmail(email: string): Promise<DyNTS_Default_User | null> {
-    try {
-      await this.dataDBService
-        .findOne({ 
-          email, 
-          __deleted: { $exists: false } 
-        } as DyFM_DBFilter<DyNTS_Default_User>)
-        .then(res => {
-          if (res) {
-            this.data = res;
-          }
-        });
-      
-      return this.data._id ? this.data : null;
-    } catch (error) {
-      throw new DyFM_Error({
-        ...this.getDefaultErrorSettings('findByEmail', error),
-        errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-DEF-FBE`,
-        userMessage: 'Failed to find user by email.',
-      });
-    }
-  }
-  
-  /**
-   * Update last login timestamp
-   */
-  async updateLastLogin(userId: string): Promise<void> {
-    try {
-      const user = await this.getDataById(userId);
-      
-      if (!user) {
-        throw new Error('User not found');
-      }
-      
-      user.lastLoginAt = new Date();
-      await this.saveData(user);
-    } catch (error) {
-      throw new DyFM_Error({
-        ...this.getDefaultErrorSettings('updateLastLogin', error),
-        errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-DEF-ULI`,
-        userMessage: 'Failed to update last login timestamp.',
-      });
-    }
-  }
-}
+import { DyFM_Error, DyFM_DBFilter } from '@futdevpro/fsm-dynamo';
+import { DyNTS_DataService } from '../../../_services/base/data.service';
+import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
+import { DyNTS_Default_User, DyNTS_defaultUser_dataParams } from '../_models/default-user.data-model';
+
+/**
+ * Default User Data Service
+ * Handles CRUD operations for default users
+ */
+export class DyNTS_Default_User_DataService extends DyNTS_DataService<DyNTS_Default_User> {
+  
+  constructor(
+    set: {
+      user?: DyNTS_Default_User;
+      issuer: string;
+    }
+  ) {
+    super(
+      new DyNTS_Default_User(set?.user),
+      DyNTS_defaultUser_dataParams,
+      set.issuer
+    );
+  }
+  
+  /**
+   * Find user by username
+   */
+  async findByUsername(username: string): Promise<DyNTS_Default_User | null> {
+    try {
+      await this.dataDBService
+        .findOne({ 
+          username, 
+          __deleted: { $exists: false } 
+        } as DyFM_DBFilter<DyNTS_Default_User>)
+        .then(res => {
+          if (res) {
+            this.data = res;
+          }
+        });
+      
+      return this.data._id ? this.data : null;
+    } catch (error) {
+      throw new DyFM_Error({
+        ...this.getDefaultErrorSettings('findByUsername', error),
+        errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-DEF-FBU`,
+        userMessage: 'Failed to find user by username.',
+      });
+    }
+  }
+  
+  /**
+   * Find user by email
+   */
+  async findByEmail(email: string): Promise<DyNTS_Default_User | null> {
+    try {
+      await this.dataDBService
+        .findOne({ 
+          email, 
+          __deleted: { $exists: false } 
+        } as DyFM_DBFilter<DyNTS_Default_User>)
+        .then(res => {
+          if (res) {
+            this.data = res;
+          }
+        });
+      
+      return this.data._id ? this.data : null;
+    } catch (error) {
+      throw new DyFM_Error({
+        ...this.getDefaultErrorSettings('findByEmail', error),
+        errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-DEF-FBE`,
+        userMessage: 'Failed to find user by email.',
+      });
+    }
+  }
+  
+  /**
+   * Update last login timestamp
+   */
+  async updateLastLogin(userId: string): Promise<void> {
+    try {
+      const user = await this.getDataById(userId);
+      
+      if (!user) {
+        throw new Error('User not found');
+      }
+      
+      user.lastLoginAt = new Date();
+      await this.saveData(user);
+    } catch (error) {
+      throw new DyFM_Error({
+        ...this.getDefaultErrorSettings('updateLastLogin', error),
+        errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-DEF-ULI`,
+        userMessage: 'Failed to update last login timestamp.',
+      });
+    }
+  }
+}

package/src/_modules/defaults/index.ts

@@ -1,17 +1,17 @@
-//
-// Defaults Module
-//
-// Provides default implementations for common services
-// Can be extended or replaced with custom implementations
-//
-
-// COLLECTIONS
-export * from './_collections/default-endpoints.util';
-
-// MODELS
-export * from './_models/default-user.data-model';
-
-// SERVICES
-export * from './_services/default-user.data-service';
-export * from './_services/default-auth.service';
-export * from './_services/default-socket-events.service';
+//
+// Defaults Module
+//
+// Provides default implementations for common services
+// Can be extended or replaced with custom implementations
+//
+
+// COLLECTIONS
+export * from './_collections/default-endpoints.util';
+
+// MODELS
+export * from './_models/default-user.data-model';
+
+// SERVICES
+export * from './_services/default-user.data-service';
+export * from './_services/default-auth.service';
+export * from './_services/default-socket-events.service';

package/src/_modules/discord-assistant/_collections/dias-global-settings.const.ts

@@ -1,19 +1,19 @@
-import { DyNTS_OAI_LLMDefaultPredefined_Requests } from '../../ai/_modules/open-ai/_collections/oai-llm-predefined-requests.conts';
-import { DyNTS_DiAs_Global_Settings } from '../_models/dias-global-settings.interface';
-
-
-export const DyNTS_DiAs_global_settings: DyNTS_DiAs_Global_Settings = {
-  defaultSystemPrompt: 
-    DyNTS_OAI_LLMDefaultPredefined_Requests.defaultSystemPrompt +
-    ' You communicate via a multi-user interface, such as a Discord channel. ',
-
-  skipConversationMessagesFlags: [
-    '|NOISE]',
-    '[VOICE|USER|OUTOFCONTEXT]',
-    '[DEBUG|'
-  ],
-  userTranslationFlags: [
-    '[VOICE|USER',
-  ],
-}
-
+import { DyNTS_OAI_LLMDefaultPredefined_Requests } from '../../ai/_modules/open-ai/_collections/oai-llm-predefined-requests.conts';
+import { DyNTS_DiAs_Global_Settings } from '../_models/dias-global-settings.interface';
+
+
+export const DyNTS_DiAs_global_settings: DyNTS_DiAs_Global_Settings = {
+  defaultSystemPrompt: 
+    DyNTS_OAI_LLMDefaultPredefined_Requests.defaultSystemPrompt +
+    ' You communicate via a multi-user interface, such as a Discord channel. ',
+
+  skipConversationMessagesFlags: [
+    '|NOISE]',
+    '[VOICE|USER|OUTOFCONTEXT]',
+    '[DEBUG|'
+  ],
+  userTranslationFlags: [
+    '[VOICE|USER',
+  ],
+}
+