Skip to content

Develop #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ndu2 merged 3 commits into from
Dec 7, 2022
Merged

Develop #26

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8fd623
minimal log for integration in shell prompt
Dec 6, 2022
7e23905
fixed sync when having 2 projects with same issue ids
Dec 7, 2022
98c5a94
fixed title when syncing after gtt create
Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed sync when having 2 projects with same issue ids
  • Loading branch information
Andreas Müller committed Dec 7, 2022
commit 7e23905282c785460938729ce0b879c8f665cfc7
2 changes: 1 addition & 1 deletion src/gtt-sync.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
47 changes: 20 additions & 27 deletions src/include/tasks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,27 @@ 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;
Expand All @@ -71,27 +75,16 @@ 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;
}

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();
});
}

Expand All @@ -116,7 +109,7 @@ 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())
Expand Down