lrf пре 2 година
родитељ
комит
0604e39f2a
3 измењених фајлова са 8 додато и 3 уклоњено
  1. 0 1
      app/controller/.dir.js
  2. 8 0
      app/service/dir.js
  3. 0 2
      app/service/table.js

+ 0 - 1
app/controller/.dir.js

@@ -34,7 +34,6 @@ module.exports = {
       query: ['skip', 'limit'],
       sort: ['sort', 'meta.createdAt'],
       desc: true,
-      count: true,
     },
   },
 };

+ 8 - 0
app/service/dir.js

@@ -13,6 +13,14 @@ class DirService extends CrudService {
     this.tableModel = this.ctx.model.Table;
   }
 
+  async query(query) {
+    const dirs = await this.model.find(query).lean();
+    const firstLevelDir = dirs.filter((f) => !f.super);
+    const inDirDirs = dirs.filter((f) => f.super);
+    const newDir = this.ctx.service.table.makeDir(firstLevelDir, inDirDirs);
+    return newDir;
+  }
+
   async delete(filter) {
     assert(filter);
     const { _id, id } = filter;

+ 0 - 2
app/service/table.js

@@ -11,7 +11,6 @@ class TableService extends CrudService {
     this.dirModel = this.ctx.model.Dir;
   }
   async query(query) {
-    console.log('line 11 in function:');
     const project = _.get(query, 'project');
     let dirs = [];
     if (project) {
@@ -29,7 +28,6 @@ class TableService extends CrudService {
   compareList(dirs, tables) {
     const result = [];
     const noDirTables = tables.filter((f) => !f.dir);
-    const inDirTables = tables.filter((f) => f.dir);
     const firstLevelDir = dirs.filter((f) => !f.super);
     const inDirDirs = dirs.filter((f) => f.super);
     let newDir = this.makeDir(firstLevelDir, inDirDirs);