Merge pull request #126 from atherdon/feature/prisma-import-update

Feature/prisma import update

package.json

@@ -3,7 +3,10 @@
   "version": "5.2.0",
   "description": "Dashboard backend",
   "main": "dist/src/index.js",
-  "repository": "https://github.com/atherdon/dash-back",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/atherdon/dash-back.git"
+  },
   "author": "kolserdav <serega12101983@gmail.com>",
   "license": "MIT",
   "private": false,
@@ -16,7 +19,7 @@
   },
   "scripts": {
     "ts": "prisma generate && tsc -p . -w",
-    "ts:clean": "tsc --build --clean", 
+    "ts:clean": "tsc --build --clean",
     "build": "prisma generate && tsc -p . && yarn migrate",
     "dev": "NODE_ENV=development nodemon ${npm_package_main}",
     "start": "NODE_ENV=development node ${npm_package_main}",
@@ -68,7 +71,15 @@
     "eslint-plugin-prettier": "3.3.1",
     "gulp": "4.0.2",
     "prettier": "2.2.1",
-    "prisma": "2.19.0",
+    "prisma": "^2.19.0",
     "typescript": "4.2.3"
-  }
+  },
+  "bugs": {
+    "url": "https://github.com/atherdon/dash-back/issues"
+  },
+  "homepage": "https://github.com/atherdon/dash-back#readme",
+  "directories": {
+    "doc": "docs"
+  },
+  "keywords": []
 }

src/prisma/fill/fillExpandable.ts

@@ -1,6 +1,6 @@
 import { PrismaClient, Expandable } from '@prisma/client';
-import { expandable2 } from '../../../data/expandable2.js';
-import { expandable3 } from '../../../data/expandable3.js';
+import { expandable2 } from '../../../data/expandable/expandable2.js';
+import { expandable3 } from '../../../data/expandable/expandable3.js';
 import * as lib from '../../lib';
 const prisma = new PrismaClient();
 
@@ -18,7 +18,8 @@ export default async function fillExpandables(): Promise<void> {
       id: undefined,
       key: expandable.key,
       name: expandable.name,
-      address: expandable.address,
+      address: undefined,
+      parentCategory: expandable.parentCategory,
       articles: expandable.articles.join(','),
       created: new Date(),
       updated: new Date(),

src/prisma/migrations/20210402063237_add_column_parent_category_to_expandable/migration.sql

@@ -0,0 +1,23 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `address` on the `Expandable` table. All the data in the column will be lost.
+  - Added the required column `parentCategory` to the `Expandable` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_Expandable" (
+    "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    "key" INTEGER NOT NULL,
+    "name" TEXT NOT NULL,
+    "parentCategory" TEXT NOT NULL,
+    "articles" TEXT NOT NULL,
+    "created" DATETIME DEFAULT CURRENT_TIMESTAMP,
+    "updated" DATETIME DEFAULT CURRENT_TIMESTAMP
+);
+INSERT INTO "new_Expandable" ("id", "key", "name", "articles", "created", "updated") SELECT "id", "key", "name", "articles", "created", "updated" FROM "Expandable";
+DROP TABLE "Expandable";
+ALTER TABLE "new_Expandable" RENAME TO "Expandable";
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;

src/prisma/schema.prisma

@@ -32,7 +32,7 @@ model Article {
   id              Int          @id @default(autoincrement())
   url             String
   ready           Boolean?     @default(false)
-  type            String // TODO change to enum when will use Mysql or Postgres 
+  type            String // TODO change to enum when will use Mysql or Postgres
   isPublished     Boolean?     @default(false)
   added           DateTime
   edited          DateTime?
@@ -58,13 +58,13 @@ model Editor {
 }
 
 model Expandable {
-  id       Int       @id @default(autoincrement())
-  key      Int
-  name     String
-  address  String
-  articles String
-  created  DateTime? @default(now())
-  updated  DateTime? @default(now())
+  id              Int       @id @default(autoincrement())
+  key             Int
+  name            String    
+  parentCategory  String
+  articles        String
+  created         DateTime? @default(now())
+  updated         DateTime? @default(now())
 }
 
 model Filter {