Improvements and new features

Author: larswaechter

README.md

@@ -12,6 +12,8 @@ Please keep in mind that we just develop the software and don't host the applica
 
 All products are built on top of the **Aionic Core** application, since this is the place where all your data is managed and distributed. So for the usage of any other application, you have to use at least [Aionic Core](https://github.com/Aionic-Apps/aionic-core/).
 
+Moreover we highly recommend [Aionic Manager](https://github.com/Aionic-Apps/aionic-manager/) which makes your data management much easier.
+
 Some of the technologies we trust: _Node.js, React, MySQL_
 
 ## Features

aionic.code-workspace

@@ -1,12 +1,15 @@
 {
-  "folders": [
-    {
-      "path": "."
-    }
-  ],
-  "settings": {
-    "editor.formatOnPaste": true,
-    "editor.formatOnSave": true,
-    "editor.formatOnType": true
-  }
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {
+		"editor.formatOnPaste": true,
+		"editor.formatOnSave": true,
+		"editor.formatOnType": true
+	},
+	"extensions": {
+		"recommendations": ["ms-vscode.vscode-typescript-tslint-plugin", "esbenp.prettier-vscode"]
+	}
 }

package.json

@@ -11,7 +11,8 @@
 	"scripts": {
 		"start": "node ./dist/index.js",
 		"build": "rm -rf dist && tsc -p tsconfig.json && gulp copy && gulp merge",
-		"watch": "nodemon --exec \"npm run build && npm run start\" --watch src --ext ts",
+		"build:light": "rm -rf dist && tsc -p tsconfig.json",
+		"watch": "nodemon --exec \"npm run build:light && npm run start\" --watch src --ext ts",
 		"seed": "node db/index.js",
 		"lint": "tslint -p tsconfig.json",
 		"prettier": "prettier --config ./.prettierrc --write src/**/*.ts",

src/api/components/global/user/model.ts

@@ -2,6 +2,7 @@ import {
 	Column,
 	CreateDateColumn,
 	Entity,
+	JoinTable,
 	ManyToMany,
 	ManyToOne,
 	OneToMany,
@@ -83,4 +84,8 @@ export class User {
 
 	@ManyToMany((type) => Board, (board) => board.users)
 	public boards: Board[];
+
+	@ManyToMany((type) => Task)
+	@JoinTable()
+	public tasksWatched: Task[];
 }

src/api/components/global/user/service.ts

@@ -6,7 +6,7 @@ import { CacheService } from '@services/cache';
 import { User } from './model';
 
 export class UserService {
-	private readonly defaultRelations: string[] = ['userRole', 'assignee'];
+	private readonly defaultRelations: string[] = ['userRole', 'assignee', 'tasksWatched'];
 
 	private readonly cacheService: CacheService = new CacheService();
 

src/api/components/milestone/project/controller.ts

@@ -3,6 +3,7 @@ import { NextFunction, Request, Response } from 'express';
 
 import { Project } from './model';
 import { ProjectService } from './service';
+import { FindConditions, OrderByCondition } from 'typeorm';
 
 export class ProjectController {
 	private readonly service: ProjectService = new ProjectService();
@@ -16,23 +17,29 @@ export class ProjectController {
 	@bind
 	public async readProjects(req: Request, res: Response, next: NextFunction): Promise<Response | void> {
 		try {
-			const { orderby, orderdir, limit } = req.query;
+			const { completed, orderby, orderdir, limit } = req.query;
 
-			let order = {};
-			let take: object = {};
+			let where: FindConditions<Project> = {};
+			let order: OrderByCondition = { completed: 'ASC' };
+			let take: number = 0;
+
+			if (completed !== undefined && completed.length) {
+				where = { ...where, completed: !!+completed };
+			}
 
 			if (orderby || orderdir) {
-				order = { order: { [orderby || 'id']: orderdir || 'ASC' } };
+				order = { [orderby || 'completed']: orderdir || 'ASC' };
 			}
 
 			if (limit) {
-				take = { take: limit };
+				take = limit;
 			}
 
 			const projects: Project[] = await this.service.readProjects({
-				relations: ['author', 'tasks', 'tasks.status'],
-				...order,
-				...take
+				where,
+				order,
+				take,
+				relations: ['author', 'tasks', 'tasks.status']
 			});
 
 			return res.json({ status: res.statusCode, data: projects });

src/api/components/milestone/project/model.ts

@@ -24,6 +24,12 @@ export class Project {
 	})
 	public title: string;
 
+	@Column({
+		default: null,
+		unique: true
+	})
+	public key: string;
+
 	@Column({
 		default: null,
 		type: 'text'
@@ -35,6 +41,11 @@ export class Project {
 	})
 	public completed: boolean;
 
+	@Column({
+		default: false
+	})
+	public isClone: boolean;
+
 	@Column({
 		default: null,
 		type: 'datetime'

src/api/components/milestone/task/model.ts

@@ -59,6 +59,11 @@ export class Task {
 	})
 	public completed: boolean;
 
+	@Column({
+		default: false
+	})
+	public isClone: boolean;
+
 	@Column({
 		default: null,
 		type: 'datetime'