updated testing

Author: Yufei Wu

src/rateLimiters/fixedWindow.ts

@@ -95,10 +95,10 @@ class FixedWindow implements RateLimiter {
         }
 
         // update a new time window, check the current capacity situation
-        if (tokens > this.capacity) {
-            await this.client.setex(uuid, keyExpiry, JSON.stringify(updatedUserWindow));
-            return { success: false, tokens: this.capacity };
-        }
+        // if (tokens > this.capacity) {
+        //     await this.client.setex(uuid, keyExpiry, JSON.stringify(updatedUserWindow));
+        //     return { success: false, tokens: this.capacity };
+        // }
         await this.client.setex(uuid, keyExpiry, JSON.stringify(updatedUserWindow));
         return {
             success: true,

test/rateLimiters/fixedWindow.test.ts

@@ -53,17 +53,35 @@ describe('Test FixedWindow Rate Limiter', () => {
             });
             test('reached 40% capacity in current time window and still can pass request', async () => {
                 const initial = 5;
+                await setTokenCountInClient(client, user2, initial, timestamp);
                 const partialWithdraw = 2;
                 expect(
-                    (await limiter.processRequest(user2, timestamp, initial + partialWithdraw))
-                        .tokens
+                    (
+                        await limiter.processRequest(
+                            user2,
+                            timestamp + WINDOW_SIZE * 0.4,
+                            partialWithdraw
+                        )
+                    ).tokens
                 ).toBe(CAPACITY - initial - partialWithdraw);
 
                 const tokenCountPartial = await getWindowFromClient(client, user2);
                 expect(tokenCountPartial.currentTokens).toBe(initial + partialWithdraw);
             });
 
             test('window is partially full and request has no leftover tokens', async () => {
+                const initial = 6;
+                const partialWithdraw = 4;
+                await setTokenCountInClient(client, user2, initial, timestamp);
+                expect(
+                    (await limiter.processRequest(user2, timestamp, partialWithdraw)).success
+                ).toBe(true);
+                expect(
+                    (await limiter.processRequest(user2, timestamp, partialWithdraw)).tokens
+                ).toBe(0);
+            });
+
+            test('window is partially full and request exceeds tokens in availability', async () => {
                 const initial = 6;
                 const partialWithdraw = 5;
                 await setTokenCountInClient(client, user2, initial, timestamp);