better error msg, async lock per user

ultish · Aug 19, 2020 · 832575f · 832575f
1 parent 183e02b
commit 832575f
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/src/resolvers/tracker.js b/src/resolvers/tracker.js
@@ -145,8 +145,8 @@ const updateTimesheet = async (
   const timesheet = await models.Timesheet.findByPk(trackedDay.timesheetId);
 
   if (timesheet) {
-    // get the 'timecharged' lock
-    await timeChargeLock.acquire("timecharged", async () => {
+    // get the 'timecharged' lock, unique per user
+    await timeChargeLock.acquire(`${me.id}:timecharged`, async () => {
       const timeBlockDate = timeBlock.startTime;
 
       // for a given date of the timeBlock, we can have overlapping timeBlocks.
@@ -712,6 +712,26 @@ export default {
             trackedTask.trackeddayId
           );
           if (trackedDay && trackedDay.userId === me.id) {
+            const existing = await models.TimeBlock.findAll({
+              where: {
+                userId: me.id,
+                startTime: startTime,
+                trackedtaskId: trackedTaskId,
+              },
+              limit: 1,
+            });
+            if (existing && existing.length) {
+              console.warn(
+                "Time Block already exists",
+                existing[0].id,
+                existing[0].startTime,
+                existing[0].userId
+              );
+              throw new UserInputError("Time Block already exists", {
+                timeBlockId: existing[0].id,
+              });
+            }
+
             const timeBlock = await models.TimeBlock.create({
               trackedtaskId: trackedTaskId,
               startTime,