Commit 9c499b90 authored by Ruslan Konviser's avatar Ruslan Konviser
Browse files

fix: make TypeORM working, mongoose failing for now...

parent 2b24112b

package.json

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
		"lint": "yarn tslint --fix",

		"start:api": "yarn run:server",

		"run:ncu": "yarn ncu --configFileName=.ncurc.json --configFilePath=./",

		"run:server": "yarn --cwd ./packages/core start",

		"run:server": "yarn run build:common && yarn --cwd ./packages/core run build && yarn --cwd ./packages/core run start",

		"run:server:dev": "yarn --cwd ./packages/core start:dev",

		"run:admin": "yarn --cwd ./packages/admin-web-angular start",

		"run:merchant": "yarn --cwd ./packages/merchant-tablet-ionic start",

packages/common-angular/tsconfig.json

+1 −6
Original line number Diff line number Diff line
@@ -15,10 +15,5 @@ 
			]

		}

	},

	"include": ["./src/**/*.ts"],

	"references": [

		{

			"path": "../common"

		}

	]

	"include": ["./src/**/*.ts", "../../common/**/*.ts",]

}

packages/common/src/@pyro/db/db-object.ts

+13 −10
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ export abstract class DBObject< 
	static modelName = '';



	constructor(obj: RawObject) {



		if (obj != undefined) {

			_.assign(this, obj);



			if (
@@ -39,6 +41,7 @@ export abstract class DBObject< 
				}

			}

		}

	}



	@PrimaryColumn()

	_id: PyroObjectId;

packages/core/package.json

+3 −3
Original line number Diff line number Diff line
@@ -20,14 +20,14 @@ 
	"scripts": {

		"coverage": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 nyc report --reporter=text-lcov | coveralls",

		"precommit": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 lint-staged",

		"start": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn tsc -p tsconfig.build.json && node build/src/main.js",

		"start": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn tsc -p tsconfig.build.json && node build/main.js",

		"start:dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 concurrently \"wait-on build/main.js && nodemon\" \"tsc -w -p tsconfig.build.json\" ",

		"start:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn -p tsconfig.build.json tsc && node ./build/src/pm2bootstrap.js",

		"start:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn -p tsconfig.build.json tsc && node ./build/pm2bootstrap.js",

		"build": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 rimraf build && tsc -p tsconfig.build.json && rimraf dist && yarn webpack",

		"build:dev": "yarn nest build --webpack",

		"dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn tsc && node ./build/main.js",

		"test": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 jest",

		"prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 node ./build/src/pm2bootstrap.js",

		"prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 node ./build/pm2bootstrap.js",

		"nestjs": "cross-env NODE_OPTIONS=--max_old_space_size=4096 node ./dist/server",

		"webpack": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 webpack --config webpack.config.js",

		"lint": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 tslint -p tsconfig.json -c tslint.json",

packages/core/src/services/services.app.ts

+4 −1
Original line number Diff line number Diff line
@@ -115,9 +115,12 @@ export class ServicesApp { 
	}



	static async CreateTypeORMConnection() {



		console.log('Creating TypeORM Connection');



		const typeORMLog = createEverLogger({ name: 'TypeORM' });



		// list of entities for which Repositories will be greated in TypeORM

		// list of entities for which Repositories will be created in TypeORM

		const entities = ServicesApp.getEntities();



		const connectionSettings: ConnectionOptions =