Merge branch 'master' of github.com:ndu2/gitlab-time-tracker

Author: Andreas Müller

src/gtt-sync.js

@@ -34,7 +34,7 @@ tasks.syncInit()
     })
     .then(() => {
         Cli.bar(`${Cli.process}  Processing issues & merge requests...`, tasks.sync.frames.length);
-        return tasks.syncNotes(Cli.advance);
+        return tasks.syncDetails(Cli.advance);
     })
     .then(() => {
         Cli.bar(`${Cli.update}  Syncing time records...`, tasks.sync.frames.length);

src/include/tasks.js

@@ -43,26 +43,29 @@ class tasks {
      * @returns {Promise}
      */
     syncResolve(callback) {
-        this.sync.resources = {
-            issue: {},
-            merge_request: {}
-        };
-
+        this.sync.resources = {}
+        
         // resolve issues and merge requests
         return this.sync.frames.forEach((frame, done) => {
             let project = frame.project,
                 type = frame.resource.type,
-                id = frame.resource.id,
-                resource = this.sync.resources[type][id];
+                id = frame.resource.id;
+            if(!(project in this.sync.resources))
+            {
+                this.sync.resources[project]=
+                {
+                    issue: {},
+                    merge_request: {}
+                };
+            }
 
-            if (resource !== undefined && resource.data.project_id)
+            if(id in this.sync.resources[project][type]) {
                 return done();
-
-            this.sync.resources[type][id] = new classes[type](this.config, {});
-            this.sync.resources[type][id]
+            }
+            this.sync.resources[project][type][id] = new classes[type](this.config, {});
+            this.sync.resources[project][type][id]
                 .make(project, id, frame.resource.new)
                 .then(() => {
-                    frame.title = this.sync.resources[type][id].data.title;
                     if (callback) callback();
                     done();
                 })
@@ -71,27 +74,18 @@ class tasks {
     }
 
     /**
-     * Get notes for all frames.
+     * sync details to frames.
      */
-    syncNotes(callback) {
+     syncDetails(callback) {
         return this.sync.frames.forEach((frame, done) => {
             let project = frame.project,
                 type = frame.resource.type,
-                id = frame.resource.id,
-                notes;
-
-            if ((notes = this.sync.resources[type][id].notes) && notes.length > 0) {
-                if (callback) callback();
-                return done();
+                id = frame.resource.id;
+        
+            if(id in this.sync.resources[project][type]) {
+                frame.title = this.sync.resources[project][type][id].data.title;
             }
-
-            this.sync.resources[type][id]
-                .getNotes()
-                .then(() => {
-                    if (callback) callback();
-                    done();
-                })
-                .catch(error => done(`Could not get notes from ${type} ${id} on "${project}"`));
+            return done();
         });
     }
 
@@ -116,13 +110,14 @@ class tasks {
 
     _addTime(frame, time) {
         return new Promise((resolve, reject) => {
-            let resource = this.sync.resources[frame.resource.type][frame.resource.id];
+            let resource = this.sync.resources[frame.project][frame.resource.type][frame.resource.id];
 
             resource.createTime(Math.ceil(time), frame._stop, frame.note)
                 .then(() => resource.getNotes())
                 .then(() => {
                     if (frame.resource.new) {
                         delete frame.resource.new;
+                        frame.resource.title = frame.resource.id;
                         frame.resource.id = resource.data.iid;
                     }
 

src/models/hasTimes.js

@@ -27,7 +27,7 @@ class hasTimes extends Base {
      * @returns {*}
      */
     createTime(time, created_at, note) {
-        if(note === null) {
+        if(note === null || note === undefined) {
             note = '';
         }
         else {