workingDiff is not working probable when there is two segment

[fathi-hindi]

I tested the workingDiff function and looks like it's not working probable when there is two segment like

moment.locale('en', {
workinghours: {
0: null,
1: ['08:00:00', '12:00:00', '13:00:00', '17:00:00'],
2: ['08:00:00', '12:00:00', '13:00:00', '17:00:00'],
3: ['09:00:00', '12:00:00', '13:00:00', '17:00:00'],
4: ['08:00:00', '12:00:00', '13:00:00', '17:00:00'],
5: ['09:00:00', '12:00:00', '13:00:00', '17:00:00'],
6: null
}
});

and when the start and end time are between the first segment only. for example:
moment('2020-02-10T08:00:00Z').workingDiff(moment('2020-02-10T09:00:00Z'), 'hours', false);
this is should be return 1 hours but it's return -3.

I investigated about the issue and I have a fix:

inside workingDiff function,

if (from.isAfter(segment[1]) ) {

should be

if (from.isAfter(segment[1]) || to.isBefore(segment[0])) {

Please review

[skouperd]

@fathi-hindi I found a workaround by having two different sets of working hours, at least to allow me to still use the workingDiff function. Something like this

moment.locale('en')

moment.defineLocale('firstShift', {
  workinghours: {
    0: null,
    1: ['08:00:00', '12:00:00'],
    2: ['08:00:00', '12:00:00'],
    3: ['09:00:00', '12:00:00'],
    4: ['08:00:00', '12:00:00'],
    5: ['09:00:00', '12:00:00'],
    6: null
  }
});
moment.defineLocale('secondShift', {
  workinghours: {
    0: null,
    1: ['13:00:00', '17:00:00'],
    2: ['13:00:00', '17:00:00'],
    3: ['13:00:00', '17:00:00'],
    4: ['13:00:00', '17:00:00'],
    5: ['13:00:00', '17:00:00'],
    6: null
  }
});

// START WITH FIRST SHIFT
moment.locale('firstShift');
let end = moment('2020-02-10T08:00:00Z');
let start = moment('2020-02-10T09:00:00Z')

let duration = end.workingDiff(start, 'hours', false); // calculation total work time during first shift

// NOW WE MOVE TO SECOND SHIFT
moment.locale('secondShift');
duration += end.workingDiff(start, 'hours', false); // calculate and add total work time during second shift

[jproze]

The workarround of @skouperd works, but it is an workarround in waiting of delivery of a fix?
This is ok for the method workingDiff but, it is necessary to write most of the other methods like isWorkingTime (as the or of calling isWorkingTime on firstShift then on secondShift, or rewrite nextWorkingTime as the min of calling nextWorkingTime on the two sets, and so...).

The fix proposed by @fathi-hindi seem to work just fine (I have arrived to a similar fix (with 2 blocks if)).

@@ -402,6 +402,9 @@
                 if (from.isAfter(segment[1])) {
                     continue;
                 }
+                if (to.isBefore(segment[0])) {
+                    continue;
+                }
                 diff += moment.max(from, segment[0]).diff(moment.min(segment[1], to), unit, true);
             }
             segments = openingTimes(from.nextWorkingDay());

Is there some difficults to integrate this fix that unlocks the power of segments?