Merge branch 'master' into feat/incremental-usage-2

Author: Andres Pinto

src/modules/file/file.usecase.spec.ts

@@ -1531,7 +1531,7 @@ describe('FileUseCases', () => {
       expect(usageService.getUserMostRecentUsage).toHaveBeenCalledWith(
         mockUser.uuid,
       );
-      expect(usageService.findOrCreateMonthlyUsage).not.toHaveBeenCalled();
+      expect(usageService.createMonthlyUsage).not.toHaveBeenCalled();
       expect(result).toBe(expectedTotal);
     });
 
@@ -1558,8 +1558,8 @@ describe('FileUseCases', () => {
         .mockResolvedValueOnce(mockGapDelta)
         .mockResolvedValueOnce(mockTodayUsage);
       jest
-        .spyOn(usageService, 'findOrCreateMonthlyUsage')
-        .mockResolvedValueOnce(undefined);
+        .spyOn(usageService, 'createMonthlyUsage')
+        .mockResolvedValue(undefined);
       jest
         .spyOn(usageService, 'getAccumulatedUsage')
         .mockResolvedValueOnce(mockAccumulatedUsage);
@@ -1574,7 +1574,7 @@ describe('FileUseCases', () => {
         mockUsage.getNextPeriodStartDate(),
         Time.endOfDay(yesterday),
       );
-      expect(usageService.findOrCreateMonthlyUsage).toHaveBeenCalledWith(
+      expect(usageService.createMonthlyUsage).toHaveBeenCalledWith(
         mockUser.uuid,
         yesterday,
         mockGapDelta,
@@ -1604,15 +1604,15 @@ describe('FileUseCases', () => {
         .mockResolvedValueOnce(mockGapDelta)
         .mockResolvedValueOnce(mockTodayUsage);
       jest
-        .spyOn(usageService, 'findOrCreateMonthlyUsage')
+        .spyOn(usageService, 'createMonthlyUsage')
         .mockResolvedValueOnce(undefined);
       jest
         .spyOn(usageService, 'getAccumulatedUsage')
         .mockResolvedValueOnce(mockAccumulatedUsage);
 
       const result = await service.getUserUsedStorageIncrementally(mockUser);
 
-      expect(usageService.findOrCreateMonthlyUsage).toHaveBeenCalledWith(
+      expect(usageService.createMonthlyUsage).toHaveBeenCalledWith(
         mockUser.uuid,
         yesterday,
         mockGapDelta,

src/modules/file/file.usecase.ts

@@ -88,14 +88,15 @@ export class FileUseCases {
 
     if (noRecordInUsageTable) {
       this.handleUserFirstDeltaCreation(user);
-      //  Fallback to previous implementation
+      // Fallback to previous implementation
       return this.fileRepository.sumExistentFileSizes(user.id);
     }
 
     const nextPeriodStart = mostRecentUsage.getNextPeriodStartDate();
-    const isUpToDate = Time.isToday(nextPeriodStart);
 
-    if (!isUpToDate) {
+    const wasUsageCalculatedForYesterday = Time.isToday(nextPeriodStart);
+    if (!wasUsageCalculatedForYesterday) {
+      // Consider moving this to events
       await this.fillDeltaGapUntilYesteday(user, nextPeriodStart);
     }
 
@@ -131,7 +132,7 @@ export class FileUseCases {
       yesterdayEndOfDay,
     );
     await this.usageService
-      .findOrCreateMonthlyUsage(user.uuid, yesterday, gapDelta)
+      .createMonthlyUsage(user.uuid, yesterday, gapDelta)
       .catch((error) =>
         new Logger('[USAGE/FILL_GAP]').error(
           `error while filling gap in usage ${JSON.stringify({ message: error.message })}`,

src/modules/usage/usage.repository.ts

@@ -17,16 +17,9 @@ export class SequelizeUsageRepository {
     return this.toDomain(newUsage);
   }
 
-  public async findOrCreateMonthlyUsage(usage: Omit<Usage, 'id'>) {
-    const [newUsage] = await this.usageModel.findOrCreate({
-      where: {
-        userId: usage.userId,
-        type: usage.type,
-        period: usage.period,
-      },
-      defaults: {
-        ...usage,
-      },
+  public async createMonthlyUsage(usage: Usage) {
+    const newUsage = await this.usageModel.create({
+      ...usage,
     });
 
     return this.toDomain(newUsage);

src/modules/usage/usage.service.spec.ts

@@ -212,17 +212,13 @@ describe('UsageService', () => {
       const usage = newUsage({ attributes: { type: UsageType.Monthly } });
 
       jest
-        .spyOn(usageRepository, 'findOrCreateMonthlyUsage')
+        .spyOn(usageRepository, 'createMonthlyUsage')
         .mockResolvedValue(usage);
 
-      const result = await service.findOrCreateMonthlyUsage(
-        userId,
-        period,
-        delta,
-      );
+      const result = await service.createMonthlyUsage(userId, period, delta);
 
       expect(result).toEqual(usage);
-      expect(usageRepository.findOrCreateMonthlyUsage).toHaveBeenCalledWith(
+      expect(usageRepository.createMonthlyUsage).toHaveBeenCalledWith(
         expect.objectContaining({
           userId,
           period,

src/modules/usage/usage.service.ts

@@ -20,11 +20,7 @@ export class UsageService {
     return this.usageRepository.createFirstUsageCalculation(userUuid);
   }
 
-  async findOrCreateMonthlyUsage(
-    userId: User['uuid'],
-    period: Date,
-    delta: number,
-  ) {
+  async createMonthlyUsage(userId: User['uuid'], period: Date, delta: number) {
     const monthlyUsage = Usage.build({
       id: v4(),
       userId: userId,
@@ -36,7 +32,7 @@ export class UsageService {
     });
 
     const createMonthlyUsage =
-      await this.usageRepository.findOrCreateMonthlyUsage(monthlyUsage);
+      await this.usageRepository.createMonthlyUsage(monthlyUsage);
 
     return createMonthlyUsage;
   }