Merge pull request #70 from RnDAO/update-rawInfo-schema

Update raw info schema

README.md

@@ -6,18 +6,19 @@ All interactions with DB
 
 ```
 rawinfo {
-    type?: string,
-    author: string,
-    content: string,
-    user_mentions?: Array<string>,
-    role_mentions?: Array<string>,
-    reactions?: Array<string>,
-    replied_user?: string,
-    channelId: Snowflake,
-    messageId: Snowflake,(unique)
-    threadId: Snowflake,
-    thread: string,
-    datetime: string (format: "YYYY-MM-DD")
+  type: number,
+  author: Snowflake,
+  content: string,
+  createdDate: Date,
+  user_mentions: Array<Snowflake>,
+  role_mentions: Array<Snowflake>,
+  reactions: Array<Snowflake>,
+  replied_user: Snowflake | null | undefined,
+  messageId: Snowflake,
+  channelId: Snowflake,
+  channelName: string | null,
+  threadId: Snowflake | null,
+  threadName: string | null,
 }
 ```
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tc_dbcomm",
-  "version": "2.2.3",
+  "version": "2.3.0",
   "description": "All interactions with DB",
   "main": "./lib/index.js",
   "scripts": {

src/index.ts

@@ -11,7 +11,7 @@ import { IUser, IUserUpdateBody, UserModel } from './interfaces/User.interface';
 import { IToken, ITokenUpdateBody, TokenModel } from './interfaces/Token.interface';
 import { IGuild, IGuildUpdateBody, GuildModel } from './interfaces/Guild.interface';
 import { IGuildMember, IGuildMemberUpdateBody, GuildMemberModel } from './interfaces/GuildMember.interface';
-import { IRawInfo, RawInfoModel } from './interfaces/RawInfo.interface';
+import { IRawInfo, IRawInfoUpdateBody, RawInfoModel } from './interfaces/RawInfo.interface';
 
 import { IMemberActivity, MemberActivityModel } from './interfaces/MemberActivity.interface';
 import {
@@ -33,6 +33,7 @@ export {
   IDiscordChannel,
   IUser,
   IRawInfo,
+  IRawInfoUpdateBody,
   IUserUpdateBody,
   IMemberActivity,
   MemberActivityModel,

src/interfaces/RawInfo.interface.ts

@@ -2,18 +2,27 @@ import { Model } from 'mongoose';
 import { Snowflake } from 'discord.js';
 
 export interface IRawInfo {
-  type?: string;
-  author?: Snowflake;
-  content?: string;
-  datetime?: string;
-  user_mentions?: Array<Snowflake>;
-  role_mentions?: Array<string>;
-  reactions?: Array<Snowflake>;
-  replied_user?: Snowflake;
-  channelId?: string;
-  messageId: string;
-  threadId: string;
-  thread?: string;
+  type: number,
+  author: Snowflake,
+  content: string,
+  createdDate: Date,
+  user_mentions: Array<Snowflake>,
+  role_mentions: Array<Snowflake>,
+  reactions: Array<Snowflake>,
+  replied_user: Snowflake | null | undefined,
+  messageId: Snowflake,
+  channelId: Snowflake,
+  channelName: string | null,
+  threadId: Snowflake | null,
+  threadName: string | null,
+}
+
+export interface IRawInfoUpdateBody {
+  channelId?: Snowflake,
+  channelName?: string | null,
+  threadId?: Snowflake | null,
+  threadName?: string | null,
+  content?: string,
 }
 
 export interface RawInfoModel extends Model<IRawInfo> {

src/models/schemas/RawInfo.schema.ts

@@ -5,7 +5,7 @@ import mongooseUniqueValidator from 'mongoose-unique-validator';
 
 const rawInfoSchema = new Schema<IRawInfo>({
   type: {
-    type: String,
+    type: Number,
   },
   author: {
     type: String,
@@ -31,20 +31,24 @@ const rawInfoSchema = new Schema<IRawInfo>({
   replied_user: {
     type: String,
   },
-  datetime: {
+  createdDate: {
+    type: Date,
+  },
+  messageId: {
     type: String,
+    unique: true,
   },
   channelId: {
     type: String,
   },
-  messageId: {
-    type: String,
-    unique: true,
+  channelName: {
+    type: String
   },
+
   threadId: {
     type: String,
   },
-  thread: {
+  threadName: {
     type: String,
   },
 });