Skip to content

Commit

Permalink
Merge pull request #8251 from ever-co/stage
Browse files Browse the repository at this point in the history 
Stage
  • Loading branch information
@evereq
evereq authored Sep 24, 2024
2 parents a28b564 + 899d5b7 commit 848d144
Show file tree
Hide file tree
Showing 51 changed files with 1,674 additions and 611 deletions.
12 changes: 7 additions & 5 deletions apps/desktop-timer/src/app/app.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
LanguageInterceptor,
LanguageModule,
LoggerService,
NgxDesktopThemeModule,
NgxLoginModule,
NoAuthGuard,
OrganizationInterceptor,
Expand All @@ -34,14 +35,14 @@ import {
SetupModule,
SplashScreenModule,
Store,
TaskTableModule,
TenantInterceptor,
TimeTrackerModule,
TimeoutInterceptor,
TokenInterceptor,
UnauthorizedInterceptor,
UpdaterModule,
serverConnectionFactory,
NgxDesktopThemeModule
serverConnectionFactory
} from '@gauzy/desktop-ui-lib';
import { environment as gauzyEnvironment } from '@gauzy/ui-config';
import {
Expand Down Expand Up @@ -117,7 +118,8 @@ if (environment.SENTRY_DSN) {
NbDatepickerModule.forRoot(),
AboutModule,
ActivityWatchModule,
RecapModule
RecapModule,
TaskTableModule
],
providers: [
AppService,
Expand Down Expand Up @@ -198,7 +200,7 @@ if (environment.SENTRY_DSN) {
},
{
provide: APP_INITIALIZER,
useFactory: () => () => { },
useFactory: () => () => {},
deps: [Sentry.TraceService],
multi: true
},
Expand All @@ -214,4 +216,4 @@ if (environment.SENTRY_DSN) {
bootstrap: [AppComponent],
exports: []
})
export class AppModule { }
export class AppModule {}
98 changes: 77 additions & 21 deletions ...es/core/src/time-tracking/time-log/commands/handlers/schedule-time-log-entries.handler.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ICommandHandler, CommandHandler } from '@nestjs/cqrs';
import { Brackets, SelectQueryBuilder, WhereExpressionBuilder } from 'typeorm';
import * as moment from 'moment';
import { isEmpty } from '@gauzy/common';
import { ID, ITimeLog } from '@gauzy/contracts';
import { ID, ITimeLog, ITimeSlot } from '@gauzy/contracts';
import { prepareSQLQuery as p } from './../../../../database/database.helper';
import { TimeLog } from './../../time-log.entity';
import { ScheduleTimeLogEntriesCommand } from '../schedule-time-log-entries.command';
Expand Down Expand Up @@ -104,40 +104,52 @@ export class ScheduleTimeLogEntriesHandler implements ICommandHandler<ScheduleTi
private async processTimeLogEntry(timeLog: ITimeLog): Promise<void> {
const { timeSlots } = timeLog;

// Calculate the minutes difference since the time log started
const minutes = moment().diff(moment.utc(timeLog.startedAt), 'minutes');

// Handle cases where there are no time slots
if (isEmpty(timeSlots)) {
// Retrieve the last log's startedAt date
const lastLogStartedAt = moment.utc(timeLog.startedAt);

// Example:
// If timeLog.startedAt = "2024-09-24 20:00:00"
// then lastLogStartedAt will be "2024-09-24 20:00:00"

// If the minutes difference is greater than 10, update the stoppedAt date
if (minutes > 10) {
// Example:
// If the current time is "2024-09-24 20:15:00", the difference is 15 minutes, which is greater than 10
if (moment.utc().diff(lastLogStartedAt, 'minutes') > 10) {
await this.updateStoppedAtUsingStartedAt(timeLog);
}
} else {
// Handle cases where there are time slots
await this.updateStoppedAtUsingTimeSlots(timeLog, timeSlots);
// Example: If timeSlots = [{ startedAt: "2024-09-24 20:05:00", duration: 300 }]
}

// Stop the pending time log entry
await this.stopTimeLog(timeLog);
}


/**
* Update the stoppedAt field using the startedAt value for a time log.
* Updates the stoppedAt field using the startedAt value for a time log.
*
* @param timeLog The time log entry to update
* @param timeLog - The time log entry to update
*/
private async updateStoppedAtUsingStartedAt(timeLog: ITimeLog): Promise<void> {
// Calculate the stoppedAt date
// Calculate the stoppedAt date by adding 10 seconds to the startedAt value
const stoppedAt = moment.utc(timeLog.startedAt).add(10, 'seconds').toDate();

// Example:
// If timeLog.startedAt = "2024-09-24 21:00:00",
// then stoppedAt will be calculated as "2024-09-24 21:00:10" (10 seconds later).

// Update the stoppedAt field in the database
await this.typeOrmTimeLogRepository.save({
id: timeLog.id,
stoppedAt
});

console.log('Schedule Time Log Entry Updated StoppedAt Using StartedAt', timeLog.startedAt);
// Example log output: "Schedule Time Log Entry Updated StoppedAt Using StartedAt 2024-09-24 21:00:00"
}

/**
Expand All @@ -146,32 +158,76 @@ export class ScheduleTimeLogEntriesHandler implements ICommandHandler<ScheduleTi
* @param timeLog The time log entry to update
* @param timeSlots The time slots associated with the time log
*/
private async updateStoppedAtUsingTimeSlots(timeLog: ITimeLog, timeSlots: any[]): Promise<void> {
// Calculate the duration
const duration = timeSlots.reduce<number>((sum, { duration }) => sum + duration, 0);

// Calculate the stoppedAt date
const stoppedAt = moment.utc(timeLog.startedAt).add(duration, 'seconds').toDate();

// Calculate the minutes difference
const minutes = moment.utc().diff(moment.utc(stoppedAt), 'minutes');
private async updateStoppedAtUsingTimeSlots(timeLog: ITimeLog, timeSlots: ITimeSlot[]): Promise<void> {
// Calculate the total duration in seconds from all time slots
const totalDurationInSeconds = timeSlots.reduce<number>((sum, { duration }) => sum + duration, 0);

// Example:
// If timeSlots = [{ duration: 300 }, { duration: 600 }]
// Then totalDurationInSeconds = 300 + 600 = 900 seconds (i.e., 15 minutes)

// Calculate the stoppedAt date by adding the total duration to the startedAt date of the time log
let stoppedAt = moment.utc(timeLog.startedAt).add(totalDurationInSeconds, 'seconds').toDate();

// Example:
// If timeLog.startedAt = "2024-09-24 10:00:00" and totalDurationInSeconds = 900,
// then stoppedAt = "2024-09-24 10:15:00"

// Retrieve the most recent time slot from the last log
const lastTimeSlot: ITimeSlot | undefined = timeSlots.sort((a: ITimeSlot, b: ITimeSlot) =>
moment(a.startedAt).isBefore(b.startedAt) ? 1 : -1
)[0];

// Example:
// If timeSlots = [{ startedAt: "2024-09-24 10:05:00" }, { startedAt: "2024-09-24 10:10:00" }]
// The sorted result will be [{ startedAt: "2024-09-24 10:10:00" }, { startedAt: "2024-09-24 10:05:00" }]
// Thus, lastTimeSlot = { startedAt: "2024-09-24 10:10:00" }

// Check if the last time slot was created more than 10 minutes ago
if (lastTimeSlot) {
// Retrieve the last time slot's startedAt date
const lastTimeSlotStartedAt = moment.utc(lastTimeSlot.startedAt);
// Retrieve the last time slot's duration
const duration = lastTimeSlot.duration;

// Example:
// If lastTimeSlot.startedAt = "2024-09-24 10:00:00" and duration = 300 (i.e., 5 minutes)
// then lastTimeSlotStartedAt would be "2024-09-24 10:00:00"
// and the stoppedAt time will be calculated as "2024-09-24 10:05:00".

// Check if the last time slot was created more than 10 minutes ago
if (moment.utc().diff(lastTimeSlotStartedAt, 'minutes') > 10) {
// Calculate the potential stoppedAt time using the total duration
// Example: If the last time slot started at "2024-09-24 10:00:00" and ran for 300 seconds (5 minutes),
// then the calculated stoppedAt time would be "2024-09-24 10:05:00".
stoppedAt = moment.utc(lastTimeSlot.startedAt).add(duration, 'seconds').toDate();
}
}

// Update the stoppedAt field in the database
if (minutes > 10) {
if (moment.utc().diff(stoppedAt, 'minutes') > 10) {
// Example:
// If the current time is "2024-09-24 21:30:00" and stoppedAt is "2024-09-24 21:15:00",
// the difference would be 15 minutes, which is greater than 10.
// In this case, the stoppedAt field will be updated in the database.

// Calculate the potential stoppedAt time using the total duration
await this.typeOrmTimeLogRepository.save({
id: timeLog.id,
stoppedAt
});
console.log('Schedule Time Log Entry Updated StoppedAt Using StoppedAt', stoppedAt);
// Example log output: "Schedule Time Log Entry Updated StoppedAt Using StoppedAt 2024-09-24 21:15:00"
}
}

/**
* Mark the time log as not running (stopped) in the database.
* Marks the time log as not running (stopped) in the database.
*
* @param timeLog The time log entry to stop
* @param timeLog - The time log entry to stop
*/
private async stopTimeLog(timeLog: ITimeLog): Promise<void> {
// Update the isRunning field to false in the database for the given time log
await this.typeOrmTimeLogRepository.save({
id: timeLog.id,
isRunning: false
Expand Down
Loading

0 comments on commit 848d144

Please sign in to comment.