From 478897ae2b69518da8323b4a719433d45ed507cc Mon Sep 17 00:00:00 2001
From: plane000 <playsplane@gmail.com>
Date: Fri, 7 Sep 2018 18:12:27 +0100
Subject: [PATCH] done datastructures

---
 logs.log                                   |  84 +++++++++++++++++++++
 src/models/database/baseDatabase.js        |  39 +++++++++-
 src/models/database/sqlite/database.sqlite | Bin 28672 -> 53248 bytes
 3 files changed, 122 insertions(+), 1 deletion(-)

diff --git a/logs.log b/logs.log
index 1bc9692..450443d 100644
--- a/logs.log
+++ b/logs.log
@@ -851,3 +851,87 @@
     "createdAt": "2018-09-05T14:38:25.837Z",
     "updatedAt": "2018-09-05T14:38:25.837Z"
 } 
+[SYSTEM STARTING UP] 
+[2018-9-7 17:44:25] [INFO] Loading config 
+[2018-9-7 17:44:25] [INFO] LOADED: src/config/configs/server.json 
+[2018-9-7 17:44:25] [INFO] LOADED: src/config/configs/database.json 
+[2018-9-7 17:44:25] [INFO] Config loaded 
+[2018-9-7 17:44:25] [INFO] Connecting to SQLite Database 
+[2018-9-7 17:44:26] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `user` (`id` BIGINT UNIQUE PRIMARY KEY, `username` TEXT, `password` TEXT, `email` TEXT, `ip` TEXT, `lastupdated` TEXT, `verified` TINYINT(1), `authcode` TEXT, `timeauthed` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); 
+[2018-9-7 17:44:26] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`user`) 
+[2018-9-7 17:44:26] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_user_1`) 
+[2018-9-7 17:44:26] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `auth` (`id` BIGINT UNIQUE PRIMARY KEY, `token` TEXT, `passhash` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); 
+[2018-9-7 17:44:26] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`auth`) 
+[2018-9-7 17:44:26] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_auth_1`) 
+[2018-9-7 17:44:26] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `permanote` (`uid` BIGINT UNIQUE PRIMARY KEY, `endpoint` TEXT, `text` TEXT, `creatorid` BIGINT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); 
+[2018-9-7 17:44:26] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`permanote`) 
+[2018-9-7 17:44:26] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_permanote_1`) 
+[2018-9-7 17:44:26] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `group` (`id` BIGINT UNIQUE PRIMARY KEY, `creatorid` BIGINT, `order` INTEGER, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); 
+[2018-9-7 17:44:26] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`group`) 
+[2018-9-7 17:44:26] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_group_1`) 
+[2018-9-7 17:44:26] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `note` (`id` BIGINT UNIQUE PRIMARY KEY, `content` TEXT, `parentgroup` BIGINT, `creatorid` BIGINT, `order` INTEGER, `catergory` TEXT, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); 
+[2018-9-7 17:44:26] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`note`) 
+[2018-9-7 17:44:26] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_note_1`) 
+[2018-9-7 17:44:26] [INFO] Connected to SQLite Database 
+[2018-9-7 17:44:26] [INFO] Server created 
+[2018-9-7 17:44:26] [INFO] HTTP service is listening at port 8080 
+[2018-9-7 17:44:26] [INFO] Setting up API HTTP endpoints 
+[2018-9-7 17:44:26] [INFO] HTTP endpoints settup 
+[2018-9-7 17:44:26] [INFO] Initialized ratelimiting middleware 
+[2018-9-7 17:44:26] [READY] 
+[SYSTEM STARTING UP] 
+[2018-9-7 17:49:14] [INFO] Loading config 
+[2018-9-7 17:49:14] [INFO] LOADED: src/config/configs/server.json 
+[2018-9-7 17:49:14] [INFO] LOADED: src/config/configs/database.json 
+[2018-9-7 17:49:14] [INFO] Config loaded 
+[2018-9-7 17:49:14] [INFO] Connecting to SQLite Database 
+[2018-9-7 17:49:15] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `user` (`id` BIGINT UNIQUE PRIMARY KEY, `username` TEXT, `password` TEXT, `email` TEXT, `ip` TEXT, `lastupdated` TEXT, `verified` TINYINT(1), `authcode` TEXT, `timeauthed` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); 
+[2018-9-7 17:49:15] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`user`) 
+[2018-9-7 17:49:15] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_user_1`) 
+[2018-9-7 17:49:15] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `auth` (`id` BIGINT UNIQUE PRIMARY KEY, `token` TEXT, `passhash` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); 
+[2018-9-7 17:49:15] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`auth`) 
+[2018-9-7 17:49:15] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_auth_1`) 
+[2018-9-7 17:49:15] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `permanote` (`uid` BIGINT UNIQUE PRIMARY KEY, `endpoint` TEXT, `text` TEXT, `creatorid` BIGINT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); 
+[2018-9-7 17:49:15] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`permanote`) 
+[2018-9-7 17:49:15] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_permanote_1`) 
+[2018-9-7 17:49:15] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `group` (`id` BIGINT UNIQUE PRIMARY KEY, `creatorid` BIGINT, `order` INTEGER, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); 
+[2018-9-7 17:49:15] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`group`) 
+[2018-9-7 17:49:15] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_group_1`) 
+[2018-9-7 17:49:15] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `note` (`id` BIGINT UNIQUE PRIMARY KEY, `content` TEXT, `parentgroup` BIGINT, `creatorid` BIGINT, `order` INTEGER, `catergory` TEXT, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); 
+[2018-9-7 17:49:15] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`note`) 
+[2018-9-7 17:49:15] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_note_1`) 
+[2018-9-7 17:49:15] [INFO] Connected to SQLite Database 
+[2018-9-7 17:49:15] [INFO] Server created 
+[2018-9-7 17:49:15] [INFO] HTTP service is listening at port 8080 
+[2018-9-7 17:49:15] [INFO] Setting up API HTTP endpoints 
+[2018-9-7 17:49:15] [INFO] HTTP endpoints settup 
+[2018-9-7 17:49:15] [INFO] Initialized ratelimiting middleware 
+[2018-9-7 17:49:15] [READY] 
+[SYSTEM STARTING UP] 
+[2018-9-7 17:49:24] [INFO] Loading config 
+[2018-9-7 17:49:24] [INFO] LOADED: src/config/configs/server.json 
+[2018-9-7 17:49:24] [INFO] LOADED: src/config/configs/database.json 
+[2018-9-7 17:49:24] [INFO] Config loaded 
+[2018-9-7 17:49:24] [INFO] Connecting to SQLite Database 
+[2018-9-7 17:49:25] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `user` (`id` BIGINT UNIQUE PRIMARY KEY, `username` TEXT, `password` TEXT, `email` TEXT, `ip` TEXT, `lastupdated` TEXT, `verified` TINYINT(1), `authcode` TEXT, `timeauthed` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); 
+[2018-9-7 17:49:25] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`user`) 
+[2018-9-7 17:49:25] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_user_1`) 
+[2018-9-7 17:49:25] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `auth` (`id` BIGINT UNIQUE PRIMARY KEY, `token` TEXT, `passhash` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); 
+[2018-9-7 17:49:25] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`auth`) 
+[2018-9-7 17:49:25] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_auth_1`) 
+[2018-9-7 17:49:25] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `permanote` (`uid` BIGINT UNIQUE PRIMARY KEY, `endpoint` TEXT, `text` TEXT, `creatorid` BIGINT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); 
+[2018-9-7 17:49:25] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`permanote`) 
+[2018-9-7 17:49:25] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_permanote_1`) 
+[2018-9-7 17:49:25] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `group` (`id` BIGINT UNIQUE PRIMARY KEY, `creatorid` BIGINT, `order` INTEGER, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); 
+[2018-9-7 17:49:25] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`group`) 
+[2018-9-7 17:49:25] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_group_1`) 
+[2018-9-7 17:49:25] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `note` (`id` BIGINT UNIQUE PRIMARY KEY, `content` TEXT, `parentgroup` BIGINT, `creatorid` BIGINT, `order` INTEGER, `catergory` TEXT, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); 
+[2018-9-7 17:49:25] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`note`) 
+[2018-9-7 17:49:25] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_note_1`) 
+[2018-9-7 17:49:25] [INFO] Connected to SQLite Database 
+[2018-9-7 17:49:25] [INFO] Server created 
+[2018-9-7 17:49:25] [INFO] HTTP service is listening at port 8080 
+[2018-9-7 17:49:25] [INFO] Setting up API HTTP endpoints 
+[2018-9-7 17:49:25] [INFO] HTTP endpoints settup 
+[2018-9-7 17:49:25] [INFO] Initialized ratelimiting middleware 
+[2018-9-7 17:49:25] [READY] 
diff --git a/src/models/database/baseDatabase.js b/src/models/database/baseDatabase.js
index f4f4413..9834367 100644
--- a/src/models/database/baseDatabase.js
+++ b/src/models/database/baseDatabase.js
@@ -8,6 +8,8 @@ let connection;
 let User;
 let Auth;
 let PermaNote;
+let Group;
+let Note;
 
 export class BaseDatabase { 
     static get Connection() {return connection;}
@@ -68,9 +70,44 @@ export class BaseDatabase {
                 type: Sequelize.BIGINT,
                 allowNull: true
             }
+        }, {
+            tableName: `permanote`
         });
 
-        
+        Group = connection.define('group', {
+            id: {
+                type: Sequelize.BIGINT,
+                primaryKey: true,
+                unique: true
+            },
+            creatorid: Sequelize.BIGINT,
+            order: Sequelize.INTEGER,
+            lastupdated: Sequelize.TEXT
+        }, {
+            tableName: `group`
+        });
+
+        Note = connection.define('note', {
+            id: {
+                type: Sequelize.BIGINT,
+                primaryKey: true,
+                unique: true
+            },
+            content: Sequelize.TEXT,
+            parentgroup: {
+                type: Sequelize.BIGINT,
+                allowNull: true
+            },
+            creatorid: Sequelize.BIGINT,
+            order: Sequelize.INTEGER,
+            catergory: {
+                type: Sequelize.TEXT,
+                allowNull: true
+            },
+            lastupdated: Sequelize.TEXT
+        }, {
+            tableName: `note`
+        });
 
         try {
             await connection.sync({force: false});
diff --git a/src/models/database/sqlite/database.sqlite b/src/models/database/sqlite/database.sqlite
index 1e5ff4870769512f31ba7e3cb09b3833499d814b..3c4a24cef07b9b0d342fcb000fc9ec1a4c8f94f7 100644
GIT binary patch
delta 510
zcmZp8z}T>Wd4jYcF9QPu2*Uu|L>*&QUIsmt244Oj3_P3{8TfYdpXYtaH;Lyd?-uT7
zJe#<_a_{E6$aQ98qc5jcV+A+6xTq*&b8tywQch}KehC=!I0v~phPWz(I6C>bDkOk}
zCqLy=QA*Cw11cy<PzZ622+>hUC`c><a?^|QOA8VdoIKq<{U#^yN=W4wrKA=mD0upX
zxVpOr0o5fZmZTP?=NDB@w&s_e9L8tM$TRsOzl;UQ;CMq2$=m46$u2G~&e)U+b_v)_
zFu{fD7O)t|F_TkxMfgx{n(W9g4m8~+MU#t7+*X{CAu}%}wW7E%ClhE*VrfY}m>&-|
zBHj>8aW{Ihvy02iGd3lH?JY<x%1s102+rU@wI41%S&?@#n;{3AxU2l+UA&4s@rH0I
g&dpDGq?6ge@glHUP~j>6#0jEoT%b5Ya4C=l09Nam6aWAK

delta 65
zcmZozz})bFae}lU7Xt$WI}pPF^F$qENiGIGl?Gn^9}H|fPZ{`j^PlH^$v27TDesoe
Of&#fbo1gMXCj$VeYY(FU