correcting Errors and reorgnising code

Author: AbdennourHachemi

format-clock-edge-cases/timeConverter.js

@@ -1,55 +1,70 @@
 function formatAs12HourClock(time) {
-  if (time.length == 4) {
-    c;
-    time = time.padStart(5, "0");
-  }
+   if (typeof time !== "string") {
+     return "Incorrect timing format";
+   }
+  const correctTimingFormat = time.match(/^(\d{1,2}):(\d{2})$/);
 
-  if (typeof time !== "string") {
-    return "nccorect timing format";
+  if (!correctTimingFormat) {
+    return "Incorrect timing format";
   }
 
-  const match = time.match(/^(\d{1,2}):(\d{2})$/);
+   if (time.length == 4) {
+     time = time.padStart(5, "0");
+   }
 
-  if (!match) {
-    return "Inccorect timing format";
-  }
+   const match = time.match(/^(\d{1,2}):(\d{2})$/);
 
-  const hours = Number(time.slice(0, 2));
-  const minutes = Number(time.slice(3, 5));
+   if (!match) {
+     return "Incorrect timing format";
+   }
 
-  if (time === "12:00") {
-    return `12:00 pm`;
-  }
+   const hours = Number(time.slice(0, 2));
+   const minutes = Number(time.slice(3, 5));
 
-  if (hours < 12) {
-    return `${time} am`;
-  }
-  if (hours >= 12) {
-    return `${time} pm`;
-  }
-  if (hours == 24) {
-    return `12:00 am`;
-  }
+   // 00:00
+   if (time === "00:00") {
+     return `12:00 am`;
+   }
 
-  if (hours > 12 && hours < 22 && minutes < 10) {
-    return `${(hours - 12).toString().padStart(2, "0")}:${minutes.toString().padStart(2, "0")} pm`;
-  }
+   // 12:00
+   if (time === "12:00") {
+     return `12:00 pm`;
+   }
 
-  if (hours > 12 && hours < 22 && minutes < 10) {
-    return `${(hours - 12).toString().padStart(2, "0")}:${minutes.toString().padStart(2, "0")} pm`;
-  }
-  if (hours > 12 && hours < 22 && minutes >= 10) {
-    return `${(hours - 12).toString().padStart(2, "0")}:${minutes} pm`;
-  }
-  if (hours >= 22 && minutes < 10) {
-    return `${hours - 12}:${minutes.toString().padStart(2, "0")} pm`;
-  }
-  if (hours >= 22 && minutes >= 10) {
-    return `${hours - 12}:${minutes} pm`;
-  }
-  if (hours >= 12 && minutes >= 10) {
-    return `${hours}:${minutes} pm`;
-  }
+   // 00:xx
+   if (hours === 0) {
+     return `12:${minutes.toString().padStart(2, "0")} am`;
+   }
+
+   // 01:xx - 11:xx
+   if (hours < 12) {
+     return `${time} am`;
+   }
+
+   // 12:xx
+   if (hours === 12) {
+     return `${time} pm`;
+   }
+
+   // 13:00 - 21:59
+   if (hours > 12 && hours < 22 && minutes < 10) {
+     return `${(hours - 12).toString().padStart(2, "0")}:${minutes
+       .toString()
+       .padStart(2, "0")} pm`;
+   }
+
+   if (hours > 12 && hours < 22 && minutes >= 10) {
+     return `${(hours - 12).toString().padStart(2, "0")}:${minutes} pm`;
+   }
+
+   // 22:00 - 23:59
+   if (hours >= 22 && minutes < 10) {
+     return `${hours - 12}:${minutes.toString().padStart(2, "0")} pm`;
+   }
+
+   if (hours >= 22 && minutes >= 10) {
+     return `${hours - 12}:${minutes} pm`;
+   }
 }
 
 export { formatAs12HourClock };

format-clock-edge-cases/timeConverter.test.js

@@ -24,7 +24,7 @@ test("can correctly convert time with missing leading zero", function () {
 });
 
 test("can correctly handel non digit format entries", function () {
-  assert.equal(formatAs12HourClock("nineOclock"), "Inccorect timing format");
+  assert.equal(formatAs12HourClock("nineOclock"), "Incorrect timing format");
 });
 /* ************************       Edge cases  Minutes     *****************************************************/
 /*   over one hour <- 60                         30                                       0 -> negative number  */