Merge pull request #86 from RnDAO/role-channel-name-changes

change role and channel field names
TogetherCrew · Jun 29, 2023 · 76460c9 · 76460c9
2 parents bb14d0c + fc95e7f
commit 76460c9
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/__tests__/unit/models/channel.model.test.ts b/__tests__/unit/models/channel.model.test.ts
@@ -6,9 +6,9 @@ describe('Channel model', () => {
     let channel: IChannel;
     beforeEach(() => {
       channel = {
-        id: '123',
+        channelId: '123',
         name: 'channel1',
-        parent_id: 'admin',
+        parentId: 'admin',
       };
     });
     test('should correctly validate a valid Channel data', async () => {

diff --git a/__tests__/unit/models/role.model.test.ts b/__tests__/unit/models/role.model.test.ts
@@ -6,7 +6,7 @@ describe('Role model', () => {
     let role: IRole;
     beforeEach(() => {
       role = {
-        id: '123',
+        roleId: '123',
         name: 'role1',
         color: 1234,
       };

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@togethercrew.dev/db",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "description": "All interactions with DB",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/src/interfaces/Channel.interface.ts b/src/interfaces/Channel.interface.ts
@@ -2,14 +2,14 @@ import { type Snowflake } from 'discord.js';
 import { type Model } from 'mongoose';
 
 export interface IChannel {
-  id: Snowflake;
+  channelId: Snowflake;
   name?: string | null;
-  parent_id?: string | null;
+  parentId?: string | null;
 }
 
 export interface IChannelUpdateBody {
   name?: string | null;
-  parent_id?: string | null;
+  parentId?: string | null;
 }
 
 export interface ChannelModel extends Model<IChannel> {

diff --git a/src/interfaces/Role.interface.ts b/src/interfaces/Role.interface.ts
@@ -2,7 +2,7 @@ import { type Snowflake } from 'discord.js';
 import { type Model } from 'mongoose';
 
 export interface IRole {
-  id: Snowflake;
+  roleId: Snowflake;
   name: string;
   color: number;
 }

diff --git a/src/models/schemas/Channel.schema.ts b/src/models/schemas/Channel.schema.ts
@@ -3,14 +3,14 @@ import { toJSON } from './plugins';
 import { IChannel, ChannelModel } from '../../interfaces';
 
 const channelSchema = new Schema<IChannel, ChannelModel>({
-  id: {
+  channelId: {
     type: String,
     unique: true,
   },
   name: {
     type: String,
   },
-  parent_id: {
+  parentId: {
     type: String,
   },
 });

diff --git a/src/models/schemas/Role.schema.ts b/src/models/schemas/Role.schema.ts
@@ -3,7 +3,7 @@ import { toJSON } from './plugins';
 import { IRole, RoleModel } from '../../interfaces';
 
 const roleSchema = new Schema<IRole, RoleModel>({
-  id: {
+  roleId: {
     type: String,
     unique: true,
   },