tods-competition-factory 1.8.40 → 1.8.42

package/dist/tods-competition-factory.development.cjs.js

@@ -2929,7 +2929,7 @@ var matchUpFormatCode = {
 };
 
 function factoryVersion() {
-    return '1.8.40';
+    return '1.8.42';
 }
 
 function getObjectTieFormat(obj) {
@@ -16856,11 +16856,12 @@ var _a$9, _b$4, _c, _d, _e;
 var ADULT = 'ADULT';
 var JUNIOR = 'JUNIOR';
 var WHEELCHAIR = 'WHEELCHAIR';
-/**
- *
- */
 var POLICY_SCHEDULING_DEFAULT = (_a$9 = {},
     _a$9[POLICY_TYPE_SCHEDULING] = {
+        allowModificationWhenMatchUpsScheduled: {
+            courts: false,
+            venues: false,
+        },
         defaultTimes: {
             averageTimes: [{ categoryNames: [], minutes: { default: 90 } }],
             recoveryTimes: [{ minutes: (_b$4 = {}, _b$4[DOUBLES$1] = 30, _b$4.default = 60, _b$4) }],
@@ -17137,6 +17138,10 @@ var _a$7, _b$2;
 var POLICY_SCORING_DEFAULT = (_a$7 = {},
     _a$7[POLICY_TYPE_SCORING] = {
         defaultMatchUpFormat: FORMAT_STANDARD,
+        allowDeletionWithScoresPresent: {
+            drawDefinitions: false,
+            structures: false,
+        },
         requireAllPositionsAssigned: false,
         processCodes: {
             incompleteAssignmentsOnDefault: ['RANKING.IGNORE'],
@@ -22848,7 +22853,7 @@ function getDrawDefinition$1(_a) {
 function bulkScheduleMatchUps$1(_a) {
     var e_1, _b, e_2, _c;
     var _d, _e, _f, _g;
-    var _h = _a.scheduleCompletedMatchUps, scheduleCompletedMatchUps = _h === void 0 ? false : _h, _j = _a.scheduleByeMatchUps, scheduleByeMatchUps = _j === void 0 ? false : _j, _k = _a.errorOnAnachronism, errorOnAnachronism = _k === void 0 ? false : _k, _l = _a.checkChronology, checkChronology = _l === void 0 ? true : _l, matchUpDependencies = _a.matchUpDependencies, tournamentRecords = _a.tournamentRecords, tournamentRecord = _a.tournamentRecord, matchUpDetails = _a.matchUpDetails, matchUpIds = _a.matchUpIds, schedule = _a.schedule;
+    var _h = _a.scheduleCompletedMatchUps, scheduleCompletedMatchUps = _h === void 0 ? false : _h, _j = _a.scheduleByeMatchUps, scheduleByeMatchUps = _j === void 0 ? false : _j, _k = _a.errorOnAnachronism, errorOnAnachronism = _k === void 0 ? false : _k, _l = _a.checkChronology, checkChronology = _l === void 0 ? true : _l, matchUpDependencies = _a.matchUpDependencies, removePriorValues = _a.removePriorValues, tournamentRecords = _a.tournamentRecords, tournamentRecord = _a.tournamentRecord, matchUpDetails = _a.matchUpDetails, matchUpIds = _a.matchUpIds, schedule = _a.schedule;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!matchUpDetails && (!matchUpIds || !Array.isArray(matchUpIds)))
@@ -22861,7 +22866,10 @@ function bulkScheduleMatchUps$1(_a) {
     // Optimize getting matchUps for all tournamentRecords
     // if matchUpDependencies are provided, skip this step
     if (checkChronology && !matchUpDependencies) {
-        var result = getMatchUpDependencies({ tournamentRecords: tournamentRecords });
+        var result = getMatchUpDependencies({
+            tournamentRecords: tournamentRecords,
+            tournamentRecord: tournamentRecord,
+        });
         matchUpDependencies = result.matchUpDependencies;
         inContextMatchUps = result.matchUps;
     }
@@ -22910,6 +22918,7 @@ function bulkScheduleMatchUps$1(_a) {
                     schedule: matchUpSchedule,
                     matchUpDependencies: matchUpDependencies,
                     errorOnAnachronism: errorOnAnachronism,
+                    removePriorValues: removePriorValues,
                     inContextMatchUps: inContextMatchUps,
                     tournamentRecords: tournamentRecords,
                     tournamentRecord: tournamentRecord,
@@ -22956,7 +22965,7 @@ function bulkScheduleMatchUps$1(_a) {
 function bulkScheduleMatchUps(_a) {
     var e_1, _b;
     var _c;
-    var _d = _a.scheduleCompletedMatchUps, scheduleCompletedMatchUps = _d === void 0 ? false : _d, _e = _a.scheduleByeMatchUps, scheduleByeMatchUps = _e === void 0 ? false : _e, errorOnAnachronism = _a.errorOnAnachronism, matchUpContextIds = _a.matchUpContextIds, tournamentRecords = _a.tournamentRecords, checkChronology = _a.checkChronology, matchUpDetails = _a.matchUpDetails, schedule = _a.schedule;
+    var _d = _a.scheduleCompletedMatchUps, scheduleCompletedMatchUps = _d === void 0 ? false : _d, _e = _a.scheduleByeMatchUps, scheduleByeMatchUps = _e === void 0 ? false : _e, errorOnAnachronism = _a.errorOnAnachronism, matchUpContextIds = _a.matchUpContextIds, removePriorValues = _a.removePriorValues, tournamentRecords = _a.tournamentRecords, checkChronology = _a.checkChronology, matchUpDetails = _a.matchUpDetails, schedule = _a.schedule;
     if (!tournamentRecords)
         return { error: MISSING_TOURNAMENT_RECORDS };
     if (!Array.isArray(matchUpContextIds) && !Array.isArray(matchUpDetails))
@@ -22979,6 +22988,7 @@ function bulkScheduleMatchUps(_a) {
                 scheduleByeMatchUps: scheduleByeMatchUps,
                 matchUpDependencies: matchUpDependencies,
                 errorOnAnachronism: errorOnAnachronism,
+                removePriorValues: removePriorValues,
                 tournamentRecords: tournamentRecords,
                 tournamentRecord: tournamentRecord,
                 checkChronology: checkChronology,
@@ -35255,13 +35265,16 @@ function processAlreadyScheduledMatchUps(_a) {
     var e_1, _b;
     var _c, _d;
     var matchUpPotentialParticipantIds = _a.matchUpPotentialParticipantIds, individualParticipantProfiles = _a.individualParticipantProfiles, dateScheduledMatchUpIds = _a.dateScheduledMatchUpIds, greatestAverageMinutes = _a.greatestAverageMinutes, dateScheduledMatchUps = _a.dateScheduledMatchUps, matchUpNotBeforeTimes = _a.matchUpNotBeforeTimes, matchUpScheduleTimes = _a.matchUpScheduleTimes, matchUpDependencies = _a.matchUpDependencies, clearScheduleDates = _a.clearScheduleDates, scheduleDate = _a.scheduleDate, minutesMap = _a.minutesMap, matchUps = _a.matchUps;
-    var byeScheduledMatchUpIds = [];
+    var byeScheduledMatchUpDetails = [];
     if (!dateScheduledMatchUpIds) {
         dateScheduledMatchUps = matchUps === null || matchUps === void 0 ? void 0 : matchUps.filter(function (matchUp) {
             var schedule = matchUp.schedule || {};
             var isByeMatchUp = matchUp.matchUpStatus === BYE;
             if (isByeMatchUp)
-                byeScheduledMatchUpIds.push(matchUp.matchUpId);
+                byeScheduledMatchUpDetails.push({
+                    tournamentId: matchUp.tournamentId,
+                    matchUpId: matchUp.matchUpId,
+                });
             return (!isByeMatchUp &&
                 hasSchedule({ schedule: schedule }) &&
                 (!scheduleDate || matchUp.schedule.scheduledDate === scheduleDate));
@@ -35316,7 +35329,7 @@ function processAlreadyScheduledMatchUps(_a) {
     }
     return {
         dateScheduledMatchUpIds: dateScheduledMatchUpIds,
-        byeScheduledMatchUpIds: byeScheduledMatchUpIds,
+        byeScheduledMatchUpDetails: byeScheduledMatchUpDetails,
         dateScheduledMatchUps: dateScheduledMatchUps,
         clearDate: clearDate,
     };
@@ -35368,10 +35381,10 @@ function getGroupedRounds(_a) {
     }
     if (groupedMatchUpIds.length) {
         groupedRounds.push({
-            averageMinutes: averageMinutes,
-            recoveryMinutes: recoveryMinutes,
-            roundPeriodLength: roundPeriodLength,
             matchUpIds: groupedMatchUpIds,
+            roundPeriodLength: roundPeriodLength,
+            recoveryMinutes: recoveryMinutes,
+            averageMinutes: averageMinutes,
         });
     }
     return { groupedRounds: groupedRounds };
@@ -35560,7 +35573,7 @@ function getVenueSchedulingDetails(_a) {
     var venueScheduledRoundDetails = {};
     // checking that matchUpDependencies is scoped to only those matchUps that are already or are to be scheduled on the same date
     var allDateScheduledMatchUpIds = [];
-    var allDateScheduledByeMatchUpIds = [];
+    var allDateScheduledByeMatchUpDetails = [];
     var allDateMatchUpIds = [];
     var _loop_1 = function (venue) {
         var _d;
@@ -35610,9 +35623,9 @@ function getVenueSchedulingDetails(_a) {
             matchUps: matchUps,
         });
         (dateScheduledMatchUpIds = processResult.dateScheduledMatchUpIds, dateScheduledMatchUps = processResult.dateScheduledMatchUps);
-        var byeScheduledMatchUpIds = processResult.byeScheduledMatchUpIds, clearDate = processResult.clearDate;
-        if (byeScheduledMatchUpIds === null || byeScheduledMatchUpIds === void 0 ? void 0 : byeScheduledMatchUpIds.length)
-            allDateScheduledByeMatchUpIds.push.apply(allDateScheduledByeMatchUpIds, __spreadArray([], __read(byeScheduledMatchUpIds), false));
+        var byeScheduledMatchUpDetails = processResult.byeScheduledMatchUpDetails, clearDate = processResult.clearDate;
+        if (byeScheduledMatchUpDetails === null || byeScheduledMatchUpDetails === void 0 ? void 0 : byeScheduledMatchUpDetails.length)
+            allDateScheduledByeMatchUpDetails.push.apply(allDateScheduledByeMatchUpDetails, __spreadArray([], __read(byeScheduledMatchUpDetails), false));
         var _g = getMatchUpsToSchedule({
             matchUpPotentialParticipantIds: matchUpPotentialParticipantIds,
             scheduleCompletedMatchUps: scheduleCompletedMatchUps,
@@ -35656,7 +35669,7 @@ function getVenueSchedulingDetails(_a) {
         finally { if (e_1) throw e_1.error; }
     }
     return {
-        allDateScheduledByeMatchUpIds: allDateScheduledByeMatchUpIds,
+        allDateScheduledByeMatchUpDetails: allDateScheduledByeMatchUpDetails,
         allDateScheduledMatchUpIds: allDateScheduledMatchUpIds,
         venueScheduledRoundDetails: venueScheduledRoundDetails,
         allDateMatchUpIds: allDateMatchUpIds,
@@ -35821,7 +35834,7 @@ function jinnScheduler(_a) {
     var e_1, _b;
     var _c, _d, _e, _f, _g, _h, _j;
     var schedulingProfileModifications = _a.schedulingProfileModifications, checkPotentialRequestConflicts = _a.checkPotentialRequestConflicts, scheduleCompletedMatchUps = _a.scheduleCompletedMatchUps, // override which can be used by mocksEngine
-    schedulingProfileIssues = _a.schedulingProfileIssues, dateSchedulingProfiles = _a.dateSchedulingProfiles, containedStructureIds = _a.containedStructureIds, matchUpDependencies = _a.matchUpDependencies, matchUpDailyLimits = _a.matchUpDailyLimits, clearScheduleDates = _a.clearScheduleDates, schedulingProfile = _a.schedulingProfile, tournamentRecords = _a.tournamentRecords, personRequests = _a.personRequests, periodLength = _a.periodLength, matchUps = _a.matchUps, courts = _a.courts, dryRun = _a.dryRun;
+    schedulingProfileIssues = _a.schedulingProfileIssues, dateSchedulingProfiles = _a.dateSchedulingProfiles, containedStructureIds = _a.containedStructureIds, matchUpDependencies = _a.matchUpDependencies, matchUpDailyLimits = _a.matchUpDailyLimits, clearScheduleDates = _a.clearScheduleDates, tournamentRecords = _a.tournamentRecords, schedulingProfile = _a.schedulingProfile, personRequests = _a.personRequests, periodLength = _a.periodLength, matchUps = _a.matchUps, courts = _a.courts, dryRun = _a.dryRun;
     var scheduleTimesRemaining = {};
     var skippedScheduleTimes = {};
     var recoveryTimeDeferredMatchUpIds = {};
@@ -35888,7 +35901,7 @@ function jinnScheduler(_a) {
             matchUps: matchUps,
             courts: courts,
             venues: venues,
-        }), venueScheduledRoundDetails = _p.venueScheduledRoundDetails, allDateMatchUpIds = _p.allDateMatchUpIds;
+        }), allDateScheduledByeMatchUpDetails = _p.allDateScheduledByeMatchUpDetails, venueScheduledRoundDetails = _p.venueScheduledRoundDetails, allDateMatchUpIds = _p.allDateMatchUpIds;
         var maxScheduleTimeAttempts = 10; // TODO: calculate this based on max court start/end range and averageMinutes
         var schedulingIterations = 0;
         var schedulingComplete = void 0;
@@ -36116,6 +36129,23 @@ function jinnScheduler(_a) {
             }
             finally { if (e_3) throw e_3.error; }
         }
+        if (!dryRun && (allDateScheduledByeMatchUpDetails === null || allDateScheduledByeMatchUpDetails === void 0 ? void 0 : allDateScheduledByeMatchUpDetails.length)) {
+            // remove scheduling information for BYE matchUps from any rounds that were scheduled
+            // remove scheduling information for BYE matchUps from any rounds that were scheduled
+            bulkScheduleMatchUps({
+                matchUpDetails: allDateScheduledByeMatchUpDetails,
+                scheduleByeMatchUps: true,
+                removePriorValues: true,
+                tournamentRecords: tournamentRecords,
+                schedule: {
+                    scheduledDate: '',
+                    scheduledTime: '',
+                    courtOrder: '',
+                    courtId: '',
+                    venueId: '',
+                },
+            });
+        }
         try {
             for (var _q = (e_4 = void 0, __values(dateSchedulingProfile.venues)), _r = _q.next(); !_r.done; _r = _q.next()) {
                 var venue = _r.value;
@@ -36187,6 +36217,285 @@ function jinnScheduler(_a) {
     return __assign(__assign({}, SUCCESS), { schedulingProfileModifications: schedulingProfileModifications, schedulingProfileIssues: schedulingProfileIssues, scheduleTimesRemaining: scheduleTimesRemaining, dateSchedulingProfiles: dateSchedulingProfiles, skippedScheduleTimes: skippedScheduleTimes, recoveryTimeDeferredMatchUpIds: recoveryTimeDeferredMatchUpIds, dependencyDeferredMatchUpIds: dependencyDeferredMatchUpIds, matchUpScheduleTimes: matchUpScheduleTimes, overLimitMatchUpIds: overLimitMatchUpIds, scheduledMatchUpIds: scheduledMatchUpIds, noTimeMatchUpIds: noTimeMatchUpIds, requestConflicts: requestConflicts, scheduledDates: scheduledDates });
 }
 
+function getPersonRequests(_a) {
+    var e_1, _b, e_2, _c, e_3, _d;
+    var tournamentRecords = _a.tournamentRecords, requestType = _a.requestType;
+    if (typeof tournamentRecords !== 'object' ||
+        !Object.keys(tournamentRecords).length)
+        return { error: MISSING_TOURNAMENT_RECORDS };
+    var personRequests = {};
+    try {
+        // create merged view of person requests across tournamentRecords
+        // ... possible for a person to be in multiple linked tournamentRecords
+        for (var _e = __values(Object.values(tournamentRecords)), _f = _e.next(); !_f.done; _f = _e.next()) {
+            var tournamentRecord = _f.value;
+            var extension = findTournamentExtension({
+                name: PERSON_REQUESTS,
+                tournamentRecord: tournamentRecord,
+            }).extension;
+            var requestObjects = (extension === null || extension === void 0 ? void 0 : extension.value) || [];
+            try {
+                for (var requestObjects_1 = (e_2 = void 0, __values(requestObjects)), requestObjects_1_1 = requestObjects_1.next(); !requestObjects_1_1.done; requestObjects_1_1 = requestObjects_1.next()) {
+                    var requestObject = requestObjects_1_1.value;
+                    var _g = requestObject || {}, personId = _g.personId, requests = _g.requests;
+                    if (!personRequests[personId])
+                        personRequests[personId] = [];
+                    try {
+                        for (var requests_1 = (e_3 = void 0, __values(requests)), requests_1_1 = requests_1.next(); !requests_1_1.done; requests_1_1 = requests_1.next()) {
+                            var request = requests_1_1.value;
+                            if (requestType && request.requestType !== requestType)
+                                continue;
+                            personRequests[personId].push(request);
+                        }
+                    }
+                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                    finally {
+                        try {
+                            if (requests_1_1 && !requests_1_1.done && (_d = requests_1.return)) _d.call(requests_1);
+                        }
+                        finally { if (e_3) throw e_3.error; }
+                    }
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (requestObjects_1_1 && !requestObjects_1_1.done && (_c = requestObjects_1.return)) _c.call(requestObjects_1);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    // audit requests and filter out any that are no longer relevant
+    // (tournament dates changed & etc)
+    return { personRequests: personRequests };
+}
+function savePersonRequests(_a) {
+    var e_4, _b, e_5, _c;
+    var _d;
+    var tournamentRecords = _a.tournamentRecords, personRequests = _a.personRequests;
+    if (!tournamentRecords)
+        return { error: MISSING_TOURNAMENT_RECORDS };
+    if (!personRequests)
+        return __assign({}, SUCCESS);
+    var tournaments = Object.values(tournamentRecords);
+    try {
+        for (var tournaments_1 = __values(tournaments), tournaments_1_1 = tournaments_1.next(); !tournaments_1_1.done; tournaments_1_1 = tournaments_1.next()) {
+            var tournamentRecord = tournaments_1_1.value;
+            var tournamentParticipants = (_d = tournamentRecord.participants) !== null && _d !== void 0 ? _d : [];
+            var relevantPersonRequests = [];
+            try {
+                for (var _e = (e_5 = void 0, __values(Object.keys(personRequests))), _f = _e.next(); !_f.done; _f = _e.next()) {
+                    var personId = _f.value;
+                    if (findParticipant({ tournamentParticipants: tournamentParticipants, personId: personId })) {
+                        var requests = personRequests[personId];
+                        if (requests.length)
+                            relevantPersonRequests.push({ personId: personId, requests: requests });
+                    }
+                }
+            }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            finally {
+                try {
+                    if (_f && !_f.done && (_c = _e.return)) _c.call(_e);
+                }
+                finally { if (e_5) throw e_5.error; }
+            }
+            if (Object.keys(relevantPersonRequests).length) {
+                var extension = {
+                    name: PERSON_REQUESTS,
+                    value: relevantPersonRequests,
+                };
+                addTournamentExtension({ tournamentRecord: tournamentRecord, extension: extension });
+            }
+        }
+    }
+    catch (e_4_1) { e_4 = { error: e_4_1 }; }
+    finally {
+        try {
+            if (tournaments_1_1 && !tournaments_1_1.done && (_b = tournaments_1.return)) _b.call(tournaments_1);
+        }
+        finally { if (e_4) throw e_4.error; }
+    }
+    return __assign({}, SUCCESS);
+}
+function addPersonRequests(_a) {
+    var tournamentRecords = _a.tournamentRecords, personId = _a.personId, requests = _a.requests;
+    if (!tournamentRecords)
+        return { error: MISSING_TOURNAMENT_RECORDS };
+    if (typeof personId !== 'string')
+        return { error: INVALID_VALUES };
+    if (!Array.isArray(requests))
+        return { error: INVALID_VALUES };
+    var personRequests = getPersonRequests({ tournamentRecords: tournamentRecords }).personRequests;
+    var mergeCount = mergePersonRequests({
+        personRequests: personRequests,
+        personId: personId,
+        requests: requests,
+    }).mergeCount;
+    if (mergeCount && personRequests) {
+        return savePersonRequests({ tournamentRecords: tournamentRecords, personRequests: personRequests });
+    }
+    else {
+        return { error: INVALID_VALUES };
+    }
+}
+// check whether there is a request for the date with overlapping times
+// extend startTime/endTime rather than creating multiple
+// ... only pertains to { requestType: DO_NOT_SCHEDULE }
+function mergePersonRequests(_a) {
+    var e_6, _b;
+    var personRequests = _a.personRequests, personId = _a.personId, requests = _a.requests;
+    if (!personRequests[personId])
+        personRequests[personId] = [];
+    var filteredRequests = requests
+        .filter(function (_a) {
+        var requestType = _a.requestType;
+        return requestType;
+    })
+        .map(function (request) {
+        var date = request.date, startTime = request.startTime, endTime = request.endTime;
+        // validate requestType
+        if (request.requestType === DO_NOT_SCHEDULE) {
+            date = extractDate(date);
+            startTime = extractTime(startTime);
+            endTime = extractTime(endTime);
+            if (date && startTime && endTime) {
+                return { date: date, startTime: startTime, endTime: endTime, requestType: request.requestType };
+            }
+        }
+        return request;
+    })
+        .filter(Boolean);
+    try {
+        // Do not add any request that is missing requestType
+        for (var filteredRequests_1 = __values(filteredRequests), filteredRequests_1_1 = filteredRequests_1.next(); !filteredRequests_1_1.done; filteredRequests_1_1 = filteredRequests_1.next()) {
+            var request = filteredRequests_1_1.value;
+            request.requestId = generateTimeCode();
+            personRequests[personId].push(request);
+        }
+    }
+    catch (e_6_1) { e_6 = { error: e_6_1 }; }
+    finally {
+        try {
+            if (filteredRequests_1_1 && !filteredRequests_1_1.done && (_b = filteredRequests_1.return)) _b.call(filteredRequests_1);
+        }
+        finally { if (e_6) throw e_6.error; }
+    }
+    return { mergeCount: filteredRequests.length };
+}
+// personRequests can be removed by date, requestId, or requestType
+function removePersonRequests(_a) {
+    var e_7, _b;
+    var tournamentRecords = _a.tournamentRecords, requestType = _a.requestType, requestId = _a.requestId, personId = _a.personId, date = _a.date;
+    if (typeof tournamentRecords !== 'object' ||
+        !Object.keys(tournamentRecords).length)
+        return { error: MISSING_TOURNAMENT_RECORDS };
+    var personRequests = getPersonRequests({ tournamentRecords: tournamentRecords }).personRequests;
+    var filterRequests = function (personId) {
+        var _a;
+        if (personRequests) {
+            personRequests[personId] = personRequests[personId].filter(function (request) {
+                return ((!requestType || request.requestType !== requestType) &&
+                    (!requestId || request.requestId !== requestId) &&
+                    (!date || request.date !== date));
+            });
+            if (!((_a = personRequests === null || personRequests === void 0 ? void 0 : personRequests[personId]) === null || _a === void 0 ? void 0 : _a.length))
+                delete personRequests[personId];
+        }
+    };
+    var removeAll = !requestType && !requestId && !personId && !date;
+    if (!removeAll) {
+        if (personId && (personRequests === null || personRequests === void 0 ? void 0 : personRequests[personId])) {
+            filterRequests(personId);
+        }
+        else if (personRequests) {
+            try {
+                for (var _c = __values(Object.keys(personRequests)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var personId_1 = _d.value;
+                    filterRequests(personId_1);
+                }
+            }
+            catch (e_7_1) { e_7 = { error: e_7_1 }; }
+            finally {
+                try {
+                    if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                }
+                finally { if (e_7) throw e_7.error; }
+            }
+        }
+    }
+    if (removeAll || !personRequests || !Object.keys(personRequests).length) {
+        return removeExtension({ tournamentRecords: tournamentRecords, name: PERSON_REQUESTS });
+    }
+    else {
+        return savePersonRequests({ tournamentRecords: tournamentRecords, personRequests: personRequests });
+    }
+}
+// can be used to both add and remove requests
+// requests which don't have existing requestId will be added
+// requests which don't have requestType will be removed
+function modifyPersonRequests(_a) {
+    var e_8, _b;
+    var tournamentRecords = _a.tournamentRecords, requests = _a.requests, personId = _a.personId;
+    if (!tournamentRecords)
+        return { error: MISSING_TOURNAMENT_RECORDS };
+    if (!Array.isArray(requests))
+        return { error: INVALID_VALUES };
+    var requestIds = requests.map(function (_a) {
+        var requestId = _a.requestId;
+        return requestId;
+    }).filter(Boolean);
+    var personRequests = getPersonRequests({ tournamentRecords: tournamentRecords }).personRequests;
+    var modifyRequests = function (personId) {
+        if (personRequests) {
+            personRequests[personId] = personRequests[personId]
+                .map(function (request) {
+                // if requestId not in requestIds then return unmodified
+                if (!requestIds.includes(request.requestId))
+                    return request;
+                // find the updatedRequest
+                var modification = requests.find(function (updatedRequest) { return updatedRequest.requestId === request.requestId; });
+                // FEATURE: returning an updatedRequest without a requestType will remove it
+                if (!modification.requestType)
+                    return;
+                return Object.assign(request, modification);
+            })
+                .filter(Boolean);
+        }
+    };
+    if (personId && (personRequests === null || personRequests === void 0 ? void 0 : personRequests[personId])) {
+        modifyRequests(personId);
+    }
+    else if (personRequests) {
+        try {
+            for (var _c = __values(Object.keys(personRequests)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var personId_2 = _d.value;
+                modifyRequests(personId_2);
+            }
+        }
+        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        finally {
+            try {
+                if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+            }
+            finally { if (e_8) throw e_8.error; }
+        }
+    }
+    var newRequests = requests.filter(function (request) { return !request.requestId; });
+    if (newRequests.length) {
+        mergePersonRequests({ personRequests: personRequests, personId: personId, requests: newRequests });
+    }
+    return savePersonRequests({ tournamentRecords: tournamentRecords, personRequests: personRequests });
+}
+
 function getEarliestCourtTime(_a) {
     var averageMinutes = _a.averageMinutes, startTime = _a.startTime, endTime = _a.endTime, court = _a.court, date = _a.date;
     if (!Array.isArray(court.dateAvailability))
@@ -36226,11 +36535,11 @@ function getEarliestCourtTime(_a) {
     return { earliestCourtTime: earliestCourtTime, courtStartTime: courtStartTime, courtEndTime: courtEndTime };
 }
 
-function proScheduler(_a) {
+function v2Scheduler(_a) {
     var e_1, _b;
     var _c, _d;
     var schedulingProfileModifications = _a.schedulingProfileModifications, checkPotentialRequestConflicts = _a.checkPotentialRequestConflicts, scheduleCompletedMatchUps = _a.scheduleCompletedMatchUps, // override which can be used by mocksEngine
-    schedulingProfileIssues = _a.schedulingProfileIssues, dateSchedulingProfiles = _a.dateSchedulingProfiles, containedStructureIds = _a.containedStructureIds, matchUpDependencies = _a.matchUpDependencies, matchUpDailyLimits = _a.matchUpDailyLimits, clearScheduleDates = _a.clearScheduleDates, tournamentRecords = _a.tournamentRecords, _e = _a.periodLength, periodLength = _e === void 0 ? 30 : _e, schedulingProfile = _a.schedulingProfile, personRequests = _a.personRequests, matchUps = _a.matchUps, courts = _a.courts, dryRun = _a.dryRun;
+    schedulingProfileIssues = _a.schedulingProfileIssues, dateSchedulingProfiles = _a.dateSchedulingProfiles, containedStructureIds = _a.containedStructureIds, matchUpDependencies = _a.matchUpDependencies, matchUpDailyLimits = _a.matchUpDailyLimits, clearScheduleDates = _a.clearScheduleDates, tournamentRecords = _a.tournamentRecords, _e = _a.periodLength, periodLength = _e === void 0 ? 30 : _e, schedulingProfile = _a.schedulingProfile, personRequests = _a.personRequests, _f = _a.matchUps, matchUps = _f === void 0 ? [] : _f, courts = _a.courts, dryRun = _a.dryRun;
     var recoveryTimeDeferredMatchUpIds = {};
     var dependencyDeferredMatchUpIds = {};
     var scheduleDateRequestConflicts = {};
@@ -36241,7 +36550,7 @@ function proScheduler(_a) {
     var noTimeMatchUpIds = {};
     var requestConflicts = {};
     var _loop_1 = function (dateSchedulingProfile) {
-        var e_2, _f, e_3, _g, e_4, _h, e_5, _j;
+        var e_2, _j, e_3, _k, e_4, _l, e_5, _m;
         var scheduleDate = extractDate(dateSchedulingProfile === null || dateSchedulingProfile === void 0 ? void 0 : dateSchedulingProfile.scheduleDate);
         var venues = (dateSchedulingProfile === null || dateSchedulingProfile === void 0 ? void 0 : dateSchedulingProfile.venues) || [];
         var matchUpPotentialParticipantIds = {};
@@ -36267,7 +36576,7 @@ function proScheduler(_a) {
         requestConflicts[scheduleDate] = [];
         // Build up matchUpNotBeforeTimes for all matchUps already scheduled on scheduleDate
         var matchUpNotBeforeTimes = {};
-        matchUps.forEach(function (matchUp) {
+        matchUps === null || matchUps === void 0 ? void 0 : matchUps.forEach(function (matchUp) {
             var _a;
             if (((_a = matchUp.schedule) === null || _a === void 0 ? void 0 : _a.scheduledDate) &&
                 sameDay(scheduleDate, extractDate(matchUp.schedule.scheduledDate))) {
@@ -36278,7 +36587,7 @@ function proScheduler(_a) {
                 });
             }
         });
-        var _k = getVenueSchedulingDetails({
+        var _o = getVenueSchedulingDetails({
             matchUpPotentialParticipantIds: matchUpPotentialParticipantIds,
             individualParticipantProfiles: individualParticipantProfiles,
             scheduleCompletedMatchUps: scheduleCompletedMatchUps,
@@ -36293,8 +36602,8 @@ function proScheduler(_a) {
             matchUps: matchUps,
             courts: courts,
             venues: venues,
-        }), allDateScheduledByeMatchUpIds = _k.allDateScheduledByeMatchUpIds, allDateScheduledMatchUpIds = _k.allDateScheduledMatchUpIds, venueScheduledRoundDetails = _k.venueScheduledRoundDetails, allDateMatchUpIds = _k.allDateMatchUpIds;
-        var dateScheduledMatchUps = matchUps.filter(function (_a) {
+        }), allDateScheduledByeMatchUpDetails = _o.allDateScheduledByeMatchUpDetails, allDateScheduledMatchUpIds = _o.allDateScheduledMatchUpIds, venueScheduledRoundDetails = _o.venueScheduledRoundDetails, allDateMatchUpIds = _o.allDateMatchUpIds;
+        var dateScheduledMatchUps = matchUps === null || matchUps === void 0 ? void 0 : matchUps.filter(function (_a) {
             var matchUpId = _a.matchUpId;
             return allDateScheduledMatchUpIds.includes(matchUpId);
         });
@@ -36337,7 +36646,7 @@ function proScheduler(_a) {
         var schedulingComplete = void 0;
         while (!schedulingComplete) {
             var _loop_2 = function (venueId) {
-                var e_6, _q;
+                var e_6, _t;
                 var details = venueScheduledRoundDetails[venueId];
                 // on each pass attempt to schedule one matchUp per court
                 // when a matchUp is scheduled, add it to details.dateScheduledMatchUps
@@ -36348,30 +36657,30 @@ function proScheduler(_a) {
                 var passIterations = 0;
                 while (!venuePassComplete) {
                     var _loop_4 = function (matchUp) {
-                        var _t;
+                        var _w;
                         if (courtIdsScheduled.length === details.courtsCount ||
                             matchUpIdsScheduled.length === details.courtsCount) {
                             venuePassComplete = true;
                             return "break";
                         }
                         var matchUpId = matchUp.matchUpId, matchUpType = matchUp.matchUpType;
-                        var _u = checkDailyLimits({
+                        var _x = checkDailyLimits({
                             matchUpPotentialParticipantIds: matchUpPotentialParticipantIds,
                             individualParticipantProfiles: individualParticipantProfiles,
                             matchUpDailyLimits: matchUpDailyLimits,
                             matchUp: matchUp,
-                        }), participantIdsAtLimit = _u.participantIdsAtLimit, relevantParticipantIds = _u.relevantParticipantIds;
+                        }), participantIdsAtLimit = _x.participantIdsAtLimit, relevantParticipantIds = _x.relevantParticipantIds;
                         if (participantIdsAtLimit.length) {
                             if (!overLimitMatchUpIds[scheduleDate].includes(matchUpId))
                                 overLimitMatchUpIds[scheduleDate].push(matchUpId);
                             return "continue";
                         }
-                        var _v = checkDependenciesScheduled({
+                        var _y = checkDependenciesScheduled({
                             matchUpScheduleTimes: matchUpScheduleTimes,
                             matchUpDependencies: matchUpDependencies,
                             allDateMatchUpIds: allDateMatchUpIds,
                             matchUp: matchUp,
-                        }), dependenciesScheduled = _v.dependenciesScheduled, remainingDependencies = _v.remainingDependencies;
+                        }), dependenciesScheduled = _y.dependenciesScheduled, remainingDependencies = _y.remainingDependencies;
                         if (!dependenciesScheduled) {
                             if (!dependencyDeferredMatchUpIds[scheduleDate][matchUpId])
                                 dependencyDeferredMatchUpIds[scheduleDate][matchUpId] = [];
@@ -36483,12 +36792,12 @@ function proScheduler(_a) {
                         else if (schedulingConflicts === null || schedulingConflicts === void 0 ? void 0 : schedulingConflicts.length) {
                             if (!scheduleDateRequestConflicts[scheduleDate])
                                 scheduleDateRequestConflicts[scheduleDate] = [];
-                            (_t = scheduleDateRequestConflicts[scheduleDate]).push.apply(_t, __spreadArray([], __read(schedulingConflicts), false));
+                            (_w = scheduleDateRequestConflicts[scheduleDate]).push.apply(_w, __spreadArray([], __read(schedulingConflicts), false));
                         }
                     };
                     try {
-                        for (var _r = (e_6 = void 0, __values(details.matchUpsToSchedule)), _s = _r.next(); !_s.done; _s = _r.next()) {
-                            var matchUp = _s.value;
+                        for (var _u = (e_6 = void 0, __values(details.matchUpsToSchedule)), _v = _u.next(); !_v.done; _v = _u.next()) {
+                            var matchUp = _v.value;
                             var state_1 = _loop_4(matchUp);
                             if (state_1 === "break")
                                 break;
@@ -36497,7 +36806,7 @@ function proScheduler(_a) {
                     catch (e_6_1) { e_6 = { error: e_6_1 }; }
                     finally {
                         try {
-                            if (_s && !_s.done && (_q = _r.return)) _q.call(_r);
+                            if (_v && !_v.done && (_t = _u.return)) _t.call(_u);
                         }
                         finally { if (e_6) throw e_6.error; }
                     }
@@ -36536,7 +36845,7 @@ function proScheduler(_a) {
             catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
-                    if (venues_1_1 && !venues_1_1.done && (_f = venues_1.return)) _f.call(venues_1);
+                    if (venues_1_1 && !venues_1_1.done && (_j = venues_1.return)) _j.call(venues_1);
                 }
                 finally { if (e_2) throw e_2.error; }
             }
@@ -36610,17 +36919,32 @@ function proScheduler(_a) {
         catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
-                if (venues_2_1 && !venues_2_1.done && (_g = venues_2.return)) _g.call(venues_2);
+                if (venues_2_1 && !venues_2_1.done && (_k = venues_2.return)) _k.call(venues_2);
             }
             finally { if (e_3) throw e_3.error; }
         }
-        if (!dryRun && (allDateScheduledByeMatchUpIds === null || allDateScheduledByeMatchUpIds === void 0 ? void 0 : allDateScheduledByeMatchUpIds.length)) ;
+        if (!dryRun && (allDateScheduledByeMatchUpDetails === null || allDateScheduledByeMatchUpDetails === void 0 ? void 0 : allDateScheduledByeMatchUpDetails.length)) {
+            // remove scheduling information for BYE matchUps from any rounds that were scheduled
+            bulkScheduleMatchUps({
+                matchUpDetails: allDateScheduledByeMatchUpDetails,
+                scheduleByeMatchUps: true,
+                removePriorValues: true,
+                tournamentRecords: tournamentRecords,
+                schedule: {
+                    scheduledDate: '',
+                    scheduledTime: '',
+                    courtOrder: '',
+                    courtId: '',
+                    venueId: '',
+                },
+            });
+        }
         try {
-            for (var _l = (e_4 = void 0, __values(dateSchedulingProfile.venues)), _m = _l.next(); !_m.done; _m = _l.next()) {
-                var venue = _m.value;
+            for (var _p = (e_4 = void 0, __values(dateSchedulingProfile.venues)), _q = _p.next(); !_q.done; _q = _p.next()) {
+                var venue = _q.value;
                 try {
-                    for (var _o = (e_5 = void 0, __values(venue.rounds)), _p = _o.next(); !_p.done; _p = _o.next()) {
-                        var round = _p.value;
+                    for (var _r = (e_5 = void 0, __values(venue.rounds)), _s = _r.next(); !_s.done; _s = _r.next()) {
+                        var round = _s.value;
                         var matchUpIds = ((_d = round.matchUps) !== null && _d !== void 0 ? _d : []).map(function (_a) {
                             var matchUpId = _a.matchUpId;
                             return matchUpId;
@@ -36641,7 +36965,7 @@ function proScheduler(_a) {
                 catch (e_5_1) { e_5 = { error: e_5_1 }; }
                 finally {
                     try {
-                        if (_p && !_p.done && (_j = _o.return)) _j.call(_o);
+                        if (_s && !_s.done && (_m = _r.return)) _m.call(_r);
                     }
                     finally { if (e_5) throw e_5.error; }
                 }
@@ -36650,27 +36974,27 @@ function proScheduler(_a) {
         catch (e_4_1) { e_4 = { error: e_4_1 }; }
         finally {
             try {
-                if (_m && !_m.done && (_h = _l.return)) _h.call(_l);
+                if (_q && !_q.done && (_l = _p.return)) _l.call(_p);
             }
             finally { if (e_4) throw e_4.error; }
         }
     };
     try {
         // Start SCHEDULING
-        for (var dateSchedulingProfiles_1 = __values(dateSchedulingProfiles), dateSchedulingProfiles_1_1 = dateSchedulingProfiles_1.next(); !dateSchedulingProfiles_1_1.done; dateSchedulingProfiles_1_1 = dateSchedulingProfiles_1.next()) {
-            var dateSchedulingProfile = dateSchedulingProfiles_1_1.value;
+        for (var _g = __values(dateSchedulingProfiles !== null && dateSchedulingProfiles !== void 0 ? dateSchedulingProfiles : []), _h = _g.next(); !_h.done; _h = _g.next()) {
+            var dateSchedulingProfile = _h.value;
             _loop_1(dateSchedulingProfile);
         }
     }
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (dateSchedulingProfiles_1_1 && !dateSchedulingProfiles_1_1.done && (_b = dateSchedulingProfiles_1.return)) _b.call(dateSchedulingProfiles_1);
+            if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
         }
         finally { if (e_1) throw e_1.error; }
     }
     // returns the original form of the dateStrings, before extractDate()
-    var scheduledDates = dateSchedulingProfiles.map(function (_a) {
+    var scheduledDates = (dateSchedulingProfiles !== null && dateSchedulingProfiles !== void 0 ? dateSchedulingProfiles : []).map(function (_a) {
         var scheduleDate = _a.scheduleDate;
         return scheduleDate;
     });
@@ -36687,285 +37011,6 @@ function proScheduler(_a) {
     return __assign(__assign({}, SUCCESS), { schedulingProfileModifications: schedulingProfileModifications, schedulingProfileIssues: schedulingProfileIssues, dateSchedulingProfiles: dateSchedulingProfiles, recoveryTimeDeferredMatchUpIds: recoveryTimeDeferredMatchUpIds, dependencyDeferredMatchUpIds: dependencyDeferredMatchUpIds, matchUpScheduleTimes: matchUpScheduleTimes, overLimitMatchUpIds: overLimitMatchUpIds, scheduledMatchUpIds: scheduledMatchUpIds, noTimeMatchUpIds: noTimeMatchUpIds, requestConflicts: requestConflicts, scheduledDates: scheduledDates });
 }
 
-function getPersonRequests(_a) {
-    var e_1, _b, e_2, _c, e_3, _d;
-    var tournamentRecords = _a.tournamentRecords, requestType = _a.requestType;
-    if (typeof tournamentRecords !== 'object' ||
-        !Object.keys(tournamentRecords).length)
-        return { error: MISSING_TOURNAMENT_RECORDS };
-    var personRequests = {};
-    try {
-        // create merged view of person requests across tournamentRecords
-        // ... possible for a person to be in multiple linked tournamentRecords
-        for (var _e = __values(Object.values(tournamentRecords)), _f = _e.next(); !_f.done; _f = _e.next()) {
-            var tournamentRecord = _f.value;
-            var extension = findTournamentExtension({
-                name: PERSON_REQUESTS,
-                tournamentRecord: tournamentRecord,
-            }).extension;
-            var requestObjects = (extension === null || extension === void 0 ? void 0 : extension.value) || [];
-            try {
-                for (var requestObjects_1 = (e_2 = void 0, __values(requestObjects)), requestObjects_1_1 = requestObjects_1.next(); !requestObjects_1_1.done; requestObjects_1_1 = requestObjects_1.next()) {
-                    var requestObject = requestObjects_1_1.value;
-                    var _g = requestObject || {}, personId = _g.personId, requests = _g.requests;
-                    if (!personRequests[personId])
-                        personRequests[personId] = [];
-                    try {
-                        for (var requests_1 = (e_3 = void 0, __values(requests)), requests_1_1 = requests_1.next(); !requests_1_1.done; requests_1_1 = requests_1.next()) {
-                            var request = requests_1_1.value;
-                            if (requestType && request.requestType !== requestType)
-                                continue;
-                            personRequests[personId].push(request);
-                        }
-                    }
-                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
-                    finally {
-                        try {
-                            if (requests_1_1 && !requests_1_1.done && (_d = requests_1.return)) _d.call(requests_1);
-                        }
-                        finally { if (e_3) throw e_3.error; }
-                    }
-                }
-            }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-            finally {
-                try {
-                    if (requestObjects_1_1 && !requestObjects_1_1.done && (_c = requestObjects_1.return)) _c.call(requestObjects_1);
-                }
-                finally { if (e_2) throw e_2.error; }
-            }
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
-        }
-        finally { if (e_1) throw e_1.error; }
-    }
-    // audit requests and filter out any that are no longer relevant
-    // (tournament dates changed & etc)
-    return { personRequests: personRequests };
-}
-function savePersonRequests(_a) {
-    var e_4, _b, e_5, _c;
-    var _d;
-    var tournamentRecords = _a.tournamentRecords, personRequests = _a.personRequests;
-    if (!tournamentRecords)
-        return { error: MISSING_TOURNAMENT_RECORDS };
-    if (!personRequests)
-        return __assign({}, SUCCESS);
-    var tournaments = Object.values(tournamentRecords);
-    try {
-        for (var tournaments_1 = __values(tournaments), tournaments_1_1 = tournaments_1.next(); !tournaments_1_1.done; tournaments_1_1 = tournaments_1.next()) {
-            var tournamentRecord = tournaments_1_1.value;
-            var tournamentParticipants = (_d = tournamentRecord.participants) !== null && _d !== void 0 ? _d : [];
-            var relevantPersonRequests = [];
-            try {
-                for (var _e = (e_5 = void 0, __values(Object.keys(personRequests))), _f = _e.next(); !_f.done; _f = _e.next()) {
-                    var personId = _f.value;
-                    if (findParticipant({ tournamentParticipants: tournamentParticipants, personId: personId })) {
-                        var requests = personRequests[personId];
-                        if (requests.length)
-                            relevantPersonRequests.push({ personId: personId, requests: requests });
-                    }
-                }
-            }
-            catch (e_5_1) { e_5 = { error: e_5_1 }; }
-            finally {
-                try {
-                    if (_f && !_f.done && (_c = _e.return)) _c.call(_e);
-                }
-                finally { if (e_5) throw e_5.error; }
-            }
-            if (Object.keys(relevantPersonRequests).length) {
-                var extension = {
-                    name: PERSON_REQUESTS,
-                    value: relevantPersonRequests,
-                };
-                addTournamentExtension({ tournamentRecord: tournamentRecord, extension: extension });
-            }
-        }
-    }
-    catch (e_4_1) { e_4 = { error: e_4_1 }; }
-    finally {
-        try {
-            if (tournaments_1_1 && !tournaments_1_1.done && (_b = tournaments_1.return)) _b.call(tournaments_1);
-        }
-        finally { if (e_4) throw e_4.error; }
-    }
-    return __assign({}, SUCCESS);
-}
-function addPersonRequests(_a) {
-    var tournamentRecords = _a.tournamentRecords, personId = _a.personId, requests = _a.requests;
-    if (!tournamentRecords)
-        return { error: MISSING_TOURNAMENT_RECORDS };
-    if (typeof personId !== 'string')
-        return { error: INVALID_VALUES };
-    if (!Array.isArray(requests))
-        return { error: INVALID_VALUES };
-    var personRequests = getPersonRequests({ tournamentRecords: tournamentRecords }).personRequests;
-    var mergeCount = mergePersonRequests({
-        personRequests: personRequests,
-        personId: personId,
-        requests: requests,
-    }).mergeCount;
-    if (mergeCount && personRequests) {
-        return savePersonRequests({ tournamentRecords: tournamentRecords, personRequests: personRequests });
-    }
-    else {
-        return { error: INVALID_VALUES };
-    }
-}
-// check whether there is a request for the date with overlapping times
-// extend startTime/endTime rather than creating multiple
-// ... only pertains to { requestType: DO_NOT_SCHEDULE }
-function mergePersonRequests(_a) {
-    var e_6, _b;
-    var personRequests = _a.personRequests, personId = _a.personId, requests = _a.requests;
-    if (!personRequests[personId])
-        personRequests[personId] = [];
-    var filteredRequests = requests
-        .filter(function (_a) {
-        var requestType = _a.requestType;
-        return requestType;
-    })
-        .map(function (request) {
-        var date = request.date, startTime = request.startTime, endTime = request.endTime;
-        // validate requestType
-        if (request.requestType === DO_NOT_SCHEDULE) {
-            date = extractDate(date);
-            startTime = extractTime(startTime);
-            endTime = extractTime(endTime);
-            if (date && startTime && endTime) {
-                return { date: date, startTime: startTime, endTime: endTime, requestType: request.requestType };
-            }
-        }
-        return request;
-    })
-        .filter(Boolean);
-    try {
-        // Do not add any request that is missing requestType
-        for (var filteredRequests_1 = __values(filteredRequests), filteredRequests_1_1 = filteredRequests_1.next(); !filteredRequests_1_1.done; filteredRequests_1_1 = filteredRequests_1.next()) {
-            var request = filteredRequests_1_1.value;
-            request.requestId = generateTimeCode();
-            personRequests[personId].push(request);
-        }
-    }
-    catch (e_6_1) { e_6 = { error: e_6_1 }; }
-    finally {
-        try {
-            if (filteredRequests_1_1 && !filteredRequests_1_1.done && (_b = filteredRequests_1.return)) _b.call(filteredRequests_1);
-        }
-        finally { if (e_6) throw e_6.error; }
-    }
-    return { mergeCount: filteredRequests.length };
-}
-// personRequests can be removed by date, requestId, or requestType
-function removePersonRequests(_a) {
-    var e_7, _b;
-    var tournamentRecords = _a.tournamentRecords, requestType = _a.requestType, requestId = _a.requestId, personId = _a.personId, date = _a.date;
-    if (typeof tournamentRecords !== 'object' ||
-        !Object.keys(tournamentRecords).length)
-        return { error: MISSING_TOURNAMENT_RECORDS };
-    var personRequests = getPersonRequests({ tournamentRecords: tournamentRecords }).personRequests;
-    var filterRequests = function (personId) {
-        var _a;
-        if (personRequests) {
-            personRequests[personId] = personRequests[personId].filter(function (request) {
-                return ((!requestType || request.requestType !== requestType) &&
-                    (!requestId || request.requestId !== requestId) &&
-                    (!date || request.date !== date));
-            });
-            if (!((_a = personRequests === null || personRequests === void 0 ? void 0 : personRequests[personId]) === null || _a === void 0 ? void 0 : _a.length))
-                delete personRequests[personId];
-        }
-    };
-    var removeAll = !requestType && !requestId && !personId && !date;
-    if (!removeAll) {
-        if (personId && (personRequests === null || personRequests === void 0 ? void 0 : personRequests[personId])) {
-            filterRequests(personId);
-        }
-        else if (personRequests) {
-            try {
-                for (var _c = __values(Object.keys(personRequests)), _d = _c.next(); !_d.done; _d = _c.next()) {
-                    var personId_1 = _d.value;
-                    filterRequests(personId_1);
-                }
-            }
-            catch (e_7_1) { e_7 = { error: e_7_1 }; }
-            finally {
-                try {
-                    if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
-                }
-                finally { if (e_7) throw e_7.error; }
-            }
-        }
-    }
-    if (removeAll || !personRequests || !Object.keys(personRequests).length) {
-        return removeExtension({ tournamentRecords: tournamentRecords, name: PERSON_REQUESTS });
-    }
-    else {
-        return savePersonRequests({ tournamentRecords: tournamentRecords, personRequests: personRequests });
-    }
-}
-// can be used to both add and remove requests
-// requests which don't have existing requestId will be added
-// requests which don't have requestType will be removed
-function modifyPersonRequests(_a) {
-    var e_8, _b;
-    var tournamentRecords = _a.tournamentRecords, requests = _a.requests, personId = _a.personId;
-    if (!tournamentRecords)
-        return { error: MISSING_TOURNAMENT_RECORDS };
-    if (!Array.isArray(requests))
-        return { error: INVALID_VALUES };
-    var requestIds = requests.map(function (_a) {
-        var requestId = _a.requestId;
-        return requestId;
-    }).filter(Boolean);
-    var personRequests = getPersonRequests({ tournamentRecords: tournamentRecords }).personRequests;
-    var modifyRequests = function (personId) {
-        if (personRequests) {
-            personRequests[personId] = personRequests[personId]
-                .map(function (request) {
-                // if requestId not in requestIds then return unmodified
-                if (!requestIds.includes(request.requestId))
-                    return request;
-                // find the updatedRequest
-                var modification = requests.find(function (updatedRequest) { return updatedRequest.requestId === request.requestId; });
-                // FEATURE: returning an updatedRequest without a requestType will remove it
-                if (!modification.requestType)
-                    return;
-                return Object.assign(request, modification);
-            })
-                .filter(Boolean);
-        }
-    };
-    if (personId && (personRequests === null || personRequests === void 0 ? void 0 : personRequests[personId])) {
-        modifyRequests(personId);
-    }
-    else if (personRequests) {
-        try {
-            for (var _c = __values(Object.keys(personRequests)), _d = _c.next(); !_d.done; _d = _c.next()) {
-                var personId_2 = _d.value;
-                modifyRequests(personId_2);
-            }
-        }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
-        finally {
-            try {
-                if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
-            }
-            finally { if (e_8) throw e_8.error; }
-        }
-    }
-    var newRequests = requests.filter(function (request) { return !request.requestId; });
-    if (newRequests.length) {
-        mergePersonRequests({ personRequests: personRequests, personId: personId, requests: newRequests });
-    }
-    return savePersonRequests({ tournamentRecords: tournamentRecords, personRequests: personRequests });
-}
-
 function clearScheduledMatchUps$1(_a) {
     var e_1, _b;
     var _c, _d, _e;
@@ -37099,7 +37144,7 @@ function getMatchUpDailyLimits(_a) {
 
 // abstraction layer to allow other schedulers to be defined at a later time
 function scheduleProfileRounds(_a) {
-    var _b = _a.checkPotentialRequestConflicts, checkPotentialRequestConflicts = _b === void 0 ? true : _b, scheduleCompletedMatchUps = _a.scheduleCompletedMatchUps, clearScheduleDates = _a.clearScheduleDates, _c = _a.scheduleDates, scheduleDates = _c === void 0 ? [] : _c, tournamentRecords = _a.tournamentRecords, periodLength = _a.periodLength, dryRun = _a.dryRun, pro = _a.pro;
+    var _b = _a.checkPotentialRequestConflicts, checkPotentialRequestConflicts = _b === void 0 ? true : _b, scheduleCompletedMatchUps = _a.scheduleCompletedMatchUps, clearScheduleDates = _a.clearScheduleDates, _c = _a.scheduleDates, scheduleDates = _c === void 0 ? [] : _c, tournamentRecords = _a.tournamentRecords, periodLength = _a.periodLength, useGarman = _a.useGarman, dryRun = _a.dryRun, pro = _a.pro;
     if (!tournamentRecords)
         return { error: MISSING_TOURNAMENT_RECORDS };
     if (!Array.isArray(scheduleDates))
@@ -37107,7 +37152,7 @@ function scheduleProfileRounds(_a) {
     var result = getSchedulingProfile$1({ tournamentRecords: tournamentRecords });
     if (result.error)
         return result;
-    var _d = result.schedulingProfile, schedulingProfile = _d === void 0 ? [] : _d, _e = result.issues, schedulingProfileIssues = _e === void 0 ? [] : _e, schedulingProfileModifications = result.modifications;
+    var schedulingProfileModifications = result.modifications, _d = result.issues, schedulingProfileIssues = _d === void 0 ? [] : _d, _e = result.schedulingProfile, schedulingProfile = _e === void 0 ? [] : _e;
     // round robin structures contain other structures and the scheduler
     // needs to reference the containing structure by contained structureIds
     var containedStructureIds = Object.assign.apply(Object, __spreadArray([{}], __read(Object.values(tournamentRecords).map(function (tournamentRecord) {
@@ -37186,12 +37231,13 @@ function scheduleProfileRounds(_a) {
         schedulingProfile: schedulingProfile,
         personRequests: personRequests,
         periodLength: periodLength,
+        useGarman: useGarman,
         matchUps: matchUps,
         dryRun: dryRun,
         courts: courts,
     };
     if (pro) {
-        return proScheduler(params);
+        return v2Scheduler(params);
     }
     else {
         return jinnScheduler(params);
@@ -40551,7 +40597,7 @@ function deletionMessage(_a) {
 
 function deleteVenue$1(_a) {
     var e_1, _b;
-    var _c, _d;
+    var _c, _d, _e, _f, _g;
     var tournamentRecord = _a.tournamentRecord, venueId = _a.venueId, force = _a.force;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
@@ -40562,7 +40608,11 @@ function deleteVenue$1(_a) {
         tournamentRecord: tournamentRecord,
         contextFilters: contextFilters,
     }).matchUps) !== null && _c !== void 0 ? _c : [];
-    if (!matchUpsToUnschedule.length || force) {
+    var appliedPolicies = (_d = getAppliedPolicies({
+        tournamentRecord: tournamentRecord,
+    })) === null || _d === void 0 ? void 0 : _d.appliedPolicies;
+    var allowModificationWhenMatchUpsScheduled = force !== null && force !== void 0 ? force : (_f = (_e = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_SCHEDULING]) === null || _e === void 0 ? void 0 : _e.allowDeletionWithScoresPresent) === null || _f === void 0 ? void 0 : _f.venues;
+    if (!matchUpsToUnschedule.length || allowModificationWhenMatchUpsScheduled) {
         try {
             // if no matchUpsToUnschedule this does nothing but avoid the deletionMessage
             for (var matchUpsToUnschedule_1 = __values(matchUpsToUnschedule), matchUpsToUnschedule_1_1 = matchUpsToUnschedule_1.next(); !matchUpsToUnschedule_1_1.done; matchUpsToUnschedule_1_1 = matchUpsToUnschedule_1.next()) {
@@ -40588,7 +40638,7 @@ function deleteVenue$1(_a) {
         return deletionMessage({ matchUpsCount: matchUpsToUnschedule.length });
     }
     var deleted;
-    tournamentRecord.venues = ((_d = tournamentRecord.venues) !== null && _d !== void 0 ? _d : []).filter(function (venue) {
+    tournamentRecord.venues = ((_g = tournamentRecord.venues) !== null && _g !== void 0 ? _g : []).filter(function (venue) {
         if ((venue === null || venue === void 0 ? void 0 : venue.venueId) !== venueId)
             return true;
         deleted = true;
@@ -40808,8 +40858,8 @@ function getScheduledVenueMatchUps(_a) {
 
 function deleteCourt$1(_a) {
     var e_1, _b;
-    var _c;
-    var tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, disableNotice = _a.disableNotice, courtId = _a.courtId, force = _a.force;
+    var _c, _d, _e, _f;
+    var tournamentRecord = _a.tournamentRecord, disableNotice = _a.disableNotice, courtId = _a.courtId, force = _a.force;
     var result = findCourt({ tournamentRecord: tournamentRecord, courtId: courtId });
     if (result.error)
         return result;
@@ -40818,15 +40868,18 @@ function deleteCourt$1(_a) {
         tournamentRecord: tournamentRecord,
         courtId: courtId,
     }).matchUps;
-    if (!(matchUps === null || matchUps === void 0 ? void 0 : matchUps.length) || force) {
+    var appliedPolicies = (_c = getAppliedPolicies({
+        tournamentRecord: tournamentRecord,
+    })) === null || _c === void 0 ? void 0 : _c.appliedPolicies;
+    var allowModificationWhenMatchUpsScheduled = force !== null && force !== void 0 ? force : (_e = (_d = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_SCHEDULING]) === null || _d === void 0 ? void 0 : _d.allowDeletionWithScoresPresent) === null || _e === void 0 ? void 0 : _e.courts;
+    if (!(matchUps === null || matchUps === void 0 ? void 0 : matchUps.length) || allowModificationWhenMatchUpsScheduled) {
         try {
-            for (var _d = __values(matchUps !== null && matchUps !== void 0 ? matchUps : []), _e = _d.next(); !_e.done; _e = _d.next()) {
-                var matchUp = _e.value;
+            for (var _g = __values(matchUps !== null && matchUps !== void 0 ? matchUps : []), _h = _g.next(); !_h.done; _h = _g.next()) {
+                var matchUp = _h.value;
                 var result_1 = removeCourtAssignment({
                     matchUpId: matchUp.matchUpId,
                     drawId: matchUp.drawId,
                     tournamentRecord: tournamentRecord,
-                    drawDefinition: drawDefinition,
                 });
                 if (result_1.error)
                     return result_1;
@@ -40835,12 +40888,12 @@ function deleteCourt$1(_a) {
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
+                if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
             }
             finally { if (e_1) throw e_1.error; }
         }
         if (venue) {
-            venue.courts = ((_c = venue.courts) !== null && _c !== void 0 ? _c : []).filter(function (courtRecord) {
+            venue.courts = ((_f = venue.courts) !== null && _f !== void 0 ? _f : []).filter(function (courtRecord) {
                 return courtRecord.courtId !== courtId;
             });
             if (!disableNotice)
@@ -41032,7 +41085,8 @@ function validDateAvailability(_a) {
 }
 
 function modifyCourtAvailability(_a) {
-    var tournamentRecord = _a.tournamentRecord, dateAvailability = _a.dateAvailability, disableNotice = _a.disableNotice, venueMatchUps = _a.venueMatchUps, courtId = _a.courtId; _a.force;
+    var _b, _c, _d;
+    var tournamentRecord = _a.tournamentRecord, dateAvailability = _a.dateAvailability, disableNotice = _a.disableNotice, venueMatchUps = _a.venueMatchUps, courtId = _a.courtId, force = _a.force;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!courtId)
@@ -41040,7 +41094,10 @@ function modifyCourtAvailability(_a) {
     var dateResult = validDateAvailability({ dateAvailability: dateAvailability });
     if (dateResult.error)
         return dateResult;
-    var _b = sortAndMergeDateAvailability(dateAvailability), updatedDateAvailability = _b.updatedDateAvailability, totalMergeCount = _b.totalMergeCount;
+    // TODO: build up a map of affected dates and:
+    // 1. whether aggregate time on given dates has increased or decreased
+    // 2. specific periods of time on given dates that are no longer available
+    var _e = sortAndMergeDateAvailability(dateAvailability), updatedDateAvailability = _e.updatedDateAvailability, totalMergeCount = _e.totalMergeCount;
     dateAvailability = updatedDateAvailability;
     var courtResult = findCourt({ tournamentRecord: tournamentRecord, courtId: courtId });
     if (courtResult.error)
@@ -41052,10 +41109,24 @@ function modifyCourtAvailability(_a) {
         courtId: courtId,
     }).matchUps;
     // TODO: check whether there are matchUps which are no longer possible to play
-    // this will only apply to Pro Scheduling
+    // In the first instance, matchUps which are explicitly scheduled on the court for times which are no longer available
+    // NOTE: see dateAvailability.test.ts
     if (courtMatchUps === null || courtMatchUps === void 0 ? void 0 : courtMatchUps.length) {
-        console.log('scheduled court matchUps', courtMatchUps.length);
+        var appliedPolicies = (_b = getAppliedPolicies({
+            tournamentRecord: tournamentRecord,
+        })) === null || _b === void 0 ? void 0 : _b.appliedPolicies;
+        var allowModificationWhenMatchUpsScheduled = force !== null && force !== void 0 ? force : (_d = (_c = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_SCHEDULING]) === null || _c === void 0 ? void 0 : _c.allowDeletionWithScoresPresent) === null || _d === void 0 ? void 0 : _d.courts;
+        // Iterate through courtMatchUps and check that scheduledTime/scheduledDate still avilable
+        var matchUpsWithInvalidScheduling = [];
+        if (matchUpsWithInvalidScheduling.length) {
+            if (allowModificationWhenMatchUpsScheduled) ;
+            else {
+                console.log('throw error: scheduled court matchUps', matchUpsWithInvalidScheduling.length);
+            }
+        }
     }
+    // TODO: In the second instance, if there is reduced aggregate court time matchUps scheduled on the affected dates (but not specific court)
+    // would have scheduling impacts impacts
     if (court) {
         court.dateAvailability = dateAvailability;
         if (!disableNotice && venue)
@@ -41361,7 +41432,7 @@ function addCourts$1(_a) {
 
 function modifyVenue$1(_a) {
     var e_1, _b;
-    var _c, _d, _e, _f, _g;
+    var _c, _d, _e, _f, _g, _h, _j, _k;
     var tournamentRecord = _a.tournamentRecord, modifications = _a.modifications, venueId = _a.venueId, force = _a.force;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
@@ -41369,6 +41440,10 @@ function modifyVenue$1(_a) {
         return { error: INVALID_OBJECT };
     if (!venueId)
         return { error: MISSING_VENUE_ID };
+    var appliedPolicies = (_c = getAppliedPolicies({
+        tournamentRecord: tournamentRecord,
+    })) === null || _c === void 0 ? void 0 : _c.appliedPolicies;
+    var allowModificationWhenMatchUpsScheduled = force !== null && force !== void 0 ? force : (_e = (_d = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_SCHEDULING]) === null || _d === void 0 ? void 0 : _d.allowDeletionWithScoresPresent) === null || _e === void 0 ? void 0 : _e.venues;
     var venueMatchUps = getScheduledVenueMatchUps({
         tournamentRecord: tournamentRecord,
         venueId: venueId,
@@ -41389,27 +41464,52 @@ function modifyVenue$1(_a) {
             var _a;
             return Object.assign(venue, (_a = {}, _a[attribute] = modifications[attribute], _a));
         });
-    var existingCourtIds = (_d = (_c = venue === null || venue === void 0 ? void 0 : venue.courts) === null || _c === void 0 ? void 0 : _c.map(function (court) { return court.courtId; })) !== null && _d !== void 0 ? _d : [];
-    var courtIdsToModify = ((_e = modifications.courts) === null || _e === void 0 ? void 0 : _e.map(function (court) { return court.courtId; })) || [];
+    var existingCourtIds = (_g = (_f = venue === null || venue === void 0 ? void 0 : venue.courts) === null || _f === void 0 ? void 0 : _f.map(function (court) { return court.courtId; })) !== null && _g !== void 0 ? _g : [];
+    var courtIdsToModify = ((_h = modifications.courts) === null || _h === void 0 ? void 0 : _h.map(function (court) { return court.courtId; })) || [];
     var courtIdsToDelete = existingCourtIds.filter(function (courtId) { return !courtIdsToModify.includes(courtId); });
+    var matchUpsWithCourtId = [];
     if (courtIdsToDelete.length) {
-        var courtsToDelete = (_f = venue === null || venue === void 0 ? void 0 : venue.courts) === null || _f === void 0 ? void 0 : _f.filter(function (court) {
+        var courtsToDelete = (_j = venue === null || venue === void 0 ? void 0 : venue.courts) === null || _j === void 0 ? void 0 : _j.filter(function (court) {
             return courtIdsToDelete.includes(court.courtId);
         });
         var scheduleDeletionsCount = courtsToDelete === null || courtsToDelete === void 0 ? void 0 : courtsToDelete.map(function (court) {
-            var _a, _b;
+            var e_2, _a;
+            var _b, _c, _d;
             // check whether deleting court would remove schedule from any matchUps
             var result = getScheduledCourtMatchUps({
                 courtId: court.courtId,
                 tournamentRecord: tournamentRecord,
                 venueMatchUps: venueMatchUps,
             });
-            return (_b = (_a = result.matchUps) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
+            try {
+                for (var _e = __values((_b = result.matchUps) !== null && _b !== void 0 ? _b : []), _f = _e.next(); !_f.done; _f = _e.next()) {
+                    var matchUp = _f.value;
+                    matchUpsWithCourtId.push({
+                        matchUpId: matchUp.matchUpId,
+                        drawId: matchUp.drawId,
+                    });
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+            return (_d = (_c = result.matchUps) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0;
         }).reduce(function (a, b) { return a + b; });
-        if (venue && (!scheduleDeletionsCount || force)) {
-            venue.courts = (_g = venue.courts) === null || _g === void 0 ? void 0 : _g.filter(function (court) {
+        if (venue &&
+            (!scheduleDeletionsCount || allowModificationWhenMatchUpsScheduled)) {
+            venue.courts = (_k = venue.courts) === null || _k === void 0 ? void 0 : _k.filter(function (court) {
                 return courtIdsToModify.includes(court.courtId);
             });
+            bulkScheduleMatchUps$1({
+                schedule: { courtId: '', scheduledDate: '' },
+                matchUpDetails: matchUpsWithCourtId,
+                removePriorValues: true,
+                tournamentRecord: tournamentRecord,
+            });
         }
         else {
             return deletionMessage({
@@ -41419,8 +41519,8 @@ function modifyVenue$1(_a) {
     }
     if (modifications.courts) {
         try {
-            for (var _h = __values(modifications.courts), _j = _h.next(); !_j.done; _j = _h.next()) {
-                var court = _j.value;
+            for (var _l = __values(modifications.courts), _m = _l.next(); !_m.done; _m = _l.next()) {
+                var court = _m.value;
                 var courtId = (court || {}).courtId;
                 var result_1 = modifyCourt$1({
                     modifications: court,
@@ -41445,7 +41545,7 @@ function modifyVenue$1(_a) {
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_j && !_j.done && (_b = _h.return)) _b.call(_h);
+                if (_m && !_m.done && (_b = _l.return)) _b.call(_l);
             }
             finally { if (e_1) throw e_1.error; }
         }
@@ -44528,8 +44628,8 @@ function setStageQualifiersCount(_a) {
 }
 
 function generateDrawTypeAndModifyDrawDefinition$1(params) {
-    var _a;
-    var _b = params || {}, _c = _b.modifyOriginal, modifyOriginal = _c === void 0 ? true : _c, _d = _b.stageSequence, stageSequence = _d === void 0 ? 1 : _d, isMock = _b.isMock;
+    var _a, _b;
+    var _c = params || {}, _d = _c.modifyOriginal, modifyOriginal = _d === void 0 ? true : _d, _e = _c.stageSequence, stageSequence = _e === void 0 ? 1 : _e, isMock = _c.isMock;
     var stack = 'generateDrawTypeAndModifyDrawDefinition';
     if (!params.drawDefinition)
         return decorateResult({
@@ -44599,7 +44699,7 @@ function generateDrawTypeAndModifyDrawDefinition$1(params) {
     }
     var drawSize = params.drawSize || mainStageDrawPositionsCount;
     Object.assign(params, definedAttributes({ drawSize: drawSize, matchUpType: matchUpType, tieFormat: tieFormat }));
-    var _e = getAllDrawMatchUps({ drawDefinition: drawDefinition }), matchUps = _e.matchUps, matchUpsMap = _e.matchUpsMap;
+    var _f = getAllDrawMatchUps({ drawDefinition: drawDefinition }), matchUps = _f.matchUps, matchUpsMap = _f.matchUpsMap;
     if (tieFormat) {
         // if there were exiting matchUps, exclude them from this step
         matchUps === null || matchUps === void 0 ? void 0 : matchUps.forEach(function (matchUp) {
@@ -44610,7 +44710,10 @@ function generateDrawTypeAndModifyDrawDefinition$1(params) {
         });
     }
     var inContextDrawMatchUps = addGoesTo({ drawDefinition: drawDefinition, matchUpsMap: matchUpsMap }).inContextDrawMatchUps;
-    modifyDrawNotice({ drawDefinition: drawDefinition });
+    modifyDrawNotice({
+        tournamentId: (_b = params.tournamentRecord) === null || _b === void 0 ? void 0 : _b.tournamentId,
+        drawDefinition: drawDefinition,
+    });
     return __assign(__assign({ inContextDrawMatchUps: inContextDrawMatchUps, drawDefinition: drawDefinition, matchUpsMap: matchUpsMap }, SUCCESS), { structures: structures, matchUps: matchUps, links: links });
 }
 
@@ -48102,7 +48205,7 @@ function renameStructures$1(_a) {
 }
 
 function removeStructure(_a) {
-    var _b, _c, _d;
+    var _b, _c, _d, _e, _f, _g, _h, _j;
     var tournamentRecord = _a.tournamentRecord, drawDefinition = _a.drawDefinition, structureId = _a.structureId, event = _a.event, force = _a.force;
     if (typeof structureId !== 'string')
         return { error: INVALID_VALUES };
@@ -48121,8 +48224,18 @@ function removeStructure(_a) {
         var score = _a.score;
         return scoreHasValue({ score: score });
     });
-    if (scoresPresent && !force)
-        return { error: SCORES_PRESENT };
+    if (scoresPresent) {
+        var appliedPolicies = (_b = getAppliedPolicies({
+            tournamentRecord: tournamentRecord,
+            drawDefinition: drawDefinition,
+            structure: structure,
+            event: event,
+        })) === null || _b === void 0 ? void 0 : _b.appliedPolicies;
+        var allowDeletionWithScoresPresent = force ||
+            ((_d = (_c = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_SCORING]) === null || _c === void 0 ? void 0 : _c.allowDeletionWithScoresPresent) === null || _d === void 0 ? void 0 : _d.structures);
+        if (!allowDeletionWithScoresPresent)
+            return { error: SCORES_PRESENT };
+    }
     var mainStageSequence1 = structures.find(function (_a) {
         var stage = _a.stage, stageSequence = _a.stageSequence;
         return stage === MAIN && stageSequence === 1;
@@ -48139,7 +48252,6 @@ function removeStructure(_a) {
     }
     var structureIds = structures.map(extractAttributes('structureId'));
     var removedMatchUpIds = [];
-    var idsToRemove = [structureId];
     var getTargetedStructureIds = function (structureId) {
         var _a, _b;
         return (_b = (_a = drawDefinition.links) === null || _a === void 0 ? void 0 : _a.map(function (link) {
@@ -48163,6 +48275,9 @@ function removeStructure(_a) {
             ? getQualifyingSourceStructureIds(id)
             : getTargetedStructureIds(id));
     });
+    var idsToRemove = isMainStageSequence1
+        ? relatedStructureIdsMap.get(structureId)
+        : [structureId];
     var _loop_1 = function () {
         var idBeingRemoved = idsToRemove.pop();
         var structure_1 = findStructure({
@@ -48173,23 +48288,21 @@ function removeStructure(_a) {
         var matchUpIds = getMatchUpIds(matchUps_1);
         removedMatchUpIds.push.apply(removedMatchUpIds, __spreadArray([], __read(matchUpIds), false));
         drawDefinition.links =
-            ((_b = drawDefinition.links) === null || _b === void 0 ? void 0 : _b.filter(function (link) {
+            ((_e = drawDefinition.links) === null || _e === void 0 ? void 0 : _e.filter(function (link) {
                 return link.source.structureId !== idBeingRemoved &&
                     link.target.structureId !== idBeingRemoved;
             })) || [];
         if (!isMainStageSequence1 ||
             (isMainStageSequence1 && qualifyingStructureIds.length) ||
             idBeingRemoved !== structureId) {
-            drawDefinition.structures = ((_c = drawDefinition.structures) !== null && _c !== void 0 ? _c : []).filter(function (structure) {
+            drawDefinition.structures = ((_f = drawDefinition.structures) !== null && _f !== void 0 ? _f : []).filter(function (structure) {
                 if (idBeingRemoved && idBeingRemoved === structure.structureId)
                     removedStructureIds.push(idBeingRemoved);
                 return structure.structureId !== idBeingRemoved;
             });
         }
         var targetedStructureIds = idBeingRemoved &&
-            (
-            // targetedStructureIdsMap[idBeingRemoved].filter(
-            (_d = relatedStructureIdsMap.get(idBeingRemoved)) === null || _d === void 0 ? void 0 : _d.filter(function (id) {
+            ((_g = relatedStructureIdsMap.get(idBeingRemoved)) === null || _g === void 0 ? void 0 : _g.filter(function (id) {
                 // IMPORTANT: only delete MAIN stageSequence: 1 if specified to protect against DOUBLE_ELIMINATION scenario
                 return id !== (mainStageSequence1 === null || mainStageSequence1 === void 0 ? void 0 : mainStageSequence1.structureId) ||
                     structureId === mainStageSequence1.structureId;
@@ -48197,7 +48310,7 @@ function removeStructure(_a) {
         if (targetedStructureIds === null || targetedStructureIds === void 0 ? void 0 : targetedStructureIds.length)
             idsToRemove.push.apply(idsToRemove, __spreadArray([], __read(targetedStructureIds), false));
     };
-    while (idsToRemove.length) {
+    while (idsToRemove === null || idsToRemove === void 0 ? void 0 : idsToRemove.length) {
         _loop_1();
     }
     // now get all remaining matchUps in the draw
@@ -48214,6 +48327,8 @@ function removeStructure(_a) {
     });
     // if this is MAIN stageSequence: 1 there must be qualifying, return to empty state
     if (isMainStageSequence1) {
+        var mainStageSequence1MatchUpIds = (_j = ((_h = mainStageSequence1.matchUps) !== null && _h !== void 0 ? _h : [])) === null || _j === void 0 ? void 0 : _j.map(extractAttributes('matchUpId'));
+        removedMatchUpIds.push.apply(removedMatchUpIds, __spreadArray([], __read(mainStageSequence1MatchUpIds), false));
         mainStageSequence1.positionAssignments = [];
         mainStageSequence1.seedAssignments = [];
         mainStageSequence1.matchUps = [];
@@ -61127,17 +61242,17 @@ function getPositionAssignments(_a) {
     };
 }
 
-function deleteDrawDefinitions(_a) {
-    var e_1, _b;
-    var _c, _d, _e;
-    var _f = _a.autoPublish, autoPublish = _f === void 0 ? true : _f, policyDefinitions = _a.policyDefinitions, tournamentRecord = _a.tournamentRecord, _g = _a.drawIds, drawIds = _g === void 0 ? [] : _g, auditData = _a.auditData, eventId = _a.eventId, event = _a.event, force = _a.force;
-    if (!tournamentRecord)
+function deleteDrawDefinitions(params) {
+    var e_1, _a;
+    var _b, _c, _d, _e, _f, _g;
+    if (!params.tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     var stack = 'deleteDrawDefinitions';
-    if (!policyDefinitions) {
-        var appliedPolicies = getAppliedPolicies({ tournamentRecord: tournamentRecord, event: event }).appliedPolicies;
-        policyDefinitions = appliedPolicies;
-    }
+    var drawIds = (_b = params.drawIds) !== null && _b !== void 0 ? _b : [];
+    var event = params.event;
+    var _h = params.autoPublish, autoPublish = _h === void 0 ? true : _h, tournamentRecord = params.tournamentRecord, auditData = params.auditData, eventId = params.eventId, force = params.force;
+    var appliedPolicies = getAppliedPolicies({ tournamentRecord: tournamentRecord, event: event }).appliedPolicies;
+    var policyDefinitions = __assign(__assign({}, appliedPolicies), params.policyDefinitions);
     var drawId = Array.isArray(drawIds) ? drawIds[0] : undefined;
     if (!event) {
         var result = findEvent({ tournamentRecord: tournamentRecord, eventId: eventId, drawId: drawId });
@@ -61173,6 +61288,8 @@ function deleteDrawDefinitions(_a) {
         var participantId = _a.participantId, drawPosition = _a.drawPosition, qualifier = _a.qualifier, bye = _a.bye;
         return ({ bye: bye, qualifier: qualifier, drawPosition: drawPosition, participantId: participantId });
     };
+    var allowDeletionWithScoresPresent = force ||
+        ((_d = (_c = appliedPolicies === null || appliedPolicies === void 0 ? void 0 : appliedPolicies[POLICY_TYPE_SCORING]) === null || _c === void 0 ? void 0 : _c.allowDeletionWithScoresPresent) === null || _d === void 0 ? void 0 : _d.drawDefinitions);
     var drawIdsWithScoresPresent = [];
     var filteredDrawDefinitions = event.drawDefinitions.filter(function (drawDefinition) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -61182,7 +61299,7 @@ function deleteDrawDefinitions(_a) {
                 var score = _a.score;
                 return scoreHasValue({ score: score });
             });
-            if (scoresPresent && !force) {
+            if (scoresPresent && !allowDeletionWithScoresPresent) {
                 drawIdsWithScoresPresent.push(drawDefinition.drawId);
                 return true;
             }
@@ -61267,21 +61384,21 @@ function deleteDrawDefinitions(_a) {
     checkSchedulingProfile({ tournamentRecord: tournamentRecord });
     var itemType = "".concat(PUBLISH, ".").concat(STATUS$1);
     var timeItem = getTimeItem({ element: event, itemType: itemType }).timeItem;
-    var publishStatus = (_c = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _c === void 0 ? void 0 : _c[PUBLIC];
+    var publishStatus = (_e = timeItem === null || timeItem === void 0 ? void 0 : timeItem.itemValue) === null || _e === void 0 ? void 0 : _e[PUBLIC];
     var publishedDrawsDeleted;
     var _loop_1 = function (drawId_2) {
-        var _h;
-        var drawPublished = (_d = publishStatus === null || publishStatus === void 0 ? void 0 : publishStatus.drawIds) === null || _d === void 0 ? void 0 : _d.includes(drawId_2);
+        var _j;
+        var drawPublished = (_f = publishStatus === null || publishStatus === void 0 ? void 0 : publishStatus.drawIds) === null || _f === void 0 ? void 0 : _f.includes(drawId_2);
         if (drawPublished) {
             publishedDrawsDeleted = true;
-            var updatedDrawIds = ((_e = publishStatus.drawIds) === null || _e === void 0 ? void 0 : _e.filter(function (publishedDrawId) { return publishedDrawId !== drawId_2; })) || [];
+            var updatedDrawIds = ((_g = publishStatus.drawIds) === null || _g === void 0 ? void 0 : _g.filter(function (publishedDrawId) { return publishedDrawId !== drawId_2; })) || [];
             var timeItem_1 = {
                 itemType: "".concat(PUBLISH, ".").concat(STATUS$1),
-                itemValue: (_h = {},
-                    _h[PUBLIC] = {
+                itemValue: (_j = {},
+                    _j[PUBLIC] = {
                         drawIds: updatedDrawIds,
                     },
-                    _h),
+                    _j),
             };
             var result = addEventTimeItem({ event: event, timeItem: timeItem_1 });
             if (result.error)
@@ -61299,7 +61416,7 @@ function deleteDrawDefinitions(_a) {
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (drawIds_1_1 && !drawIds_1_1.done && (_b = drawIds_1.return)) _b.call(drawIds_1);
+            if (drawIds_1_1 && !drawIds_1_1.done && (_a = drawIds_1.return)) _a.call(drawIds_1);
         }
         finally { if (e_1) throw e_1.error; }
     }
@@ -63087,7 +63204,7 @@ function resetVoluntaryConsolationStructure(_a) {
 
 function deleteFlightProfileAndFlightDraws(_a) {
     var _b;
-    var _c = _a.autoPublish, autoPublish = _c === void 0 ? true : _c, tournamentRecord = _a.tournamentRecord, auditData = _a.auditData, event = _a.event;
+    var _c = _a.autoPublish, autoPublish = _c === void 0 ? true : _c, tournamentRecord = _a.tournamentRecord, auditData = _a.auditData, event = _a.event, force = _a.force;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (!event)
@@ -63105,6 +63222,7 @@ function deleteFlightProfileAndFlightDraws(_a) {
             auditData: auditData,
             drawIds: drawIds,
             event: event,
+            force: force,
         });
         if (result.error)
             return result;
@@ -70625,7 +70743,7 @@ function generateVenues(_a) {
 function modifyTournamentRecord(params) {
     var e_1, _a, e_2, _b, _c, _d;
     var _e, _f, _g;
-    var _h = params.ratingsParameters, ratingsParameters$1 = _h === void 0 ? ratingsParameters : _h, _j = params.participantsProfile, participantsProfile = _j === void 0 ? {} : _j, matchUpStatusProfile = params.matchUpStatusProfile, completeAllMatchUps = params.completeAllMatchUps, autoEntryPositions = params.autoEntryPositions, hydrateCollections = params.hydrateCollections, randomWinningSide = params.randomWinningSide, schedulingProfile = params.schedulingProfile, tournamentRecord = params.tournamentRecord, eventProfiles = params.eventProfiles, venueProfiles = params.venueProfiles, autoSchedule = params.autoSchedule, drawProfiles = params.drawProfiles, uuids = params.uuids;
+    var _h = params.ratingsParameters, ratingsParameters$1 = _h === void 0 ? ratingsParameters : _h, _j = params.participantsProfile, participantsProfile = _j === void 0 ? {} : _j, matchUpStatusProfile = params.matchUpStatusProfile, completeAllMatchUps = params.completeAllMatchUps, autoEntryPositions = params.autoEntryPositions, hydrateCollections = params.hydrateCollections, randomWinningSide = params.randomWinningSide, schedulingProfile = params.schedulingProfile, tournamentRecord = params.tournamentRecord, eventProfiles = params.eventProfiles, periodLength = params.periodLength, venueProfiles = params.venueProfiles, autoSchedule = params.autoSchedule, drawProfiles = params.drawProfiles, uuids = params.uuids;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     var allUniqueParticipantIds = [];
@@ -70832,7 +70950,10 @@ function modifyTournamentRecord(params) {
         if (autoSchedule) {
             var tournamentId = tournamentRecord.tournamentId;
             var tournamentRecords_1 = (_d = {}, _d[tournamentId] = tournamentRecord, _d);
-            schedulerResult = scheduleProfileRounds({ tournamentRecords: tournamentRecords_1 });
+            schedulerResult = scheduleProfileRounds({
+                tournamentRecords: tournamentRecords_1,
+                periodLength: periodLength,
+            });
         }
     }
     var totalParticipantsCount = tournamentRecord.participants.length;
@@ -70957,7 +71078,7 @@ var mockTournamentNames = [
 function generateTournamentRecord(params) {
     var e_1, _a, _b, e_2, _c, e_3, _d, _e;
     var tournamentAttributes = params.tournamentAttributes, startDate = params.startDate, endDate = params.endDate;
-    var _f = params.tournamentName, tournamentName = _f === void 0 ? randomPop(mockTournamentNames) : _f, _g = params.ratingsParameters, ratingsParameters$1 = _g === void 0 ? ratingsParameters : _g, scheduleCompletedMatchUps = params.scheduleCompletedMatchUps, tournamentExtensions = params.tournamentExtensions, matchUpStatusProfile = params.matchUpStatusProfile, completeAllMatchUps = params.completeAllMatchUps, participantsProfile = params.participantsProfile, autoEntryPositions = params.autoEntryPositions, hydrateCollections = params.hydrateCollections, randomWinningSide = params.randomWinningSide, policyDefinitions = params.policyDefinitions, schedulingProfile = params.schedulingProfile, autoSchedule = params.autoSchedule, eventProfiles = params.eventProfiles, venueProfiles = params.venueProfiles, drawProfiles = params.drawProfiles, uuids = params.uuids;
+    var _f = params.tournamentName, tournamentName = _f === void 0 ? randomPop(mockTournamentNames) : _f, _g = params.ratingsParameters, ratingsParameters$1 = _g === void 0 ? ratingsParameters : _g, scheduleCompletedMatchUps = params.scheduleCompletedMatchUps, tournamentExtensions = params.tournamentExtensions, matchUpStatusProfile = params.matchUpStatusProfile, completeAllMatchUps = params.completeAllMatchUps, participantsProfile = params.participantsProfile, autoEntryPositions = params.autoEntryPositions, hydrateCollections = params.hydrateCollections, randomWinningSide = params.randomWinningSide, policyDefinitions = params.policyDefinitions, schedulingProfile = params.schedulingProfile, periodLength = params.periodLength, autoSchedule = params.autoSchedule, eventProfiles = params.eventProfiles, venueProfiles = params.venueProfiles, drawProfiles = params.drawProfiles, uuids = params.uuids;
     if ((startDate && !isValidDateString(startDate)) ||
         (endDate && !isValidDateString(endDate)))
         return { error: INVALID_DATE };
@@ -71118,6 +71239,7 @@ function generateTournamentRecord(params) {
             schedulerResult = scheduleProfileRounds({
                 scheduleCompletedMatchUps: scheduleCompletedMatchUps,
                 tournamentRecords: tournamentRecords,
+                periodLength: periodLength,
             });
         }
     }