Skip to content

Commit 4787762

Browse files
committed
Drop silly logs & ones referencing session
Most of these actions are already logged at the operation level. Errors do not need to be manually logged anymore either. Now that we have SessionHost we can work in the current user to implicit log statements.
1 parent e67e564 commit 4787762

File tree

14 files changed

+20
-180
lines changed

14 files changed

+20
-180
lines changed

src/components/budget/budget.service.ts

Lines changed: 5 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
type Session,
1212
viewOfChangeset,
1313
} from '~/common';
14-
import { HandleIdLookup, ILogger, Logger, ResourceResolver } from '~/core';
14+
import { HandleIdLookup, ResourceResolver } from '~/core';
1515
import { mapListResults } from '~/core/database/results';
1616
import { Privileges } from '../authorization';
1717
import { FileService } from '../file';
@@ -41,15 +41,12 @@ export class BudgetService {
4141
private readonly budgetRepo: BudgetRepository,
4242
private readonly budgetRecordsRepo: BudgetRecordRepository,
4343
private readonly resources: ResourceResolver,
44-
@Logger('budget:service') private readonly logger: ILogger,
4544
) {}
4645

4746
async create(
4847
{ projectId, ...input }: CreateBudget,
4948
session: Session,
5049
): Promise<Budget> {
51-
this.logger.debug('Creating budget', { projectId });
52-
5350
const universalTemplateFileId = await generateId<FileId>();
5451

5552
try {
@@ -58,11 +55,6 @@ export class BudgetService {
5855
universalTemplateFileId,
5956
);
6057

61-
this.logger.debug(`Created Budget`, {
62-
id: budgetId,
63-
userId: session.userId,
64-
});
65-
6658
await this.files.createDefinedFile(
6759
universalTemplateFileId,
6860
`Universal Budget Template`,
@@ -75,10 +67,6 @@ export class BudgetService {
7567

7668
return await this.readOne(budgetId, session);
7769
} catch (exception) {
78-
this.logger.error(`Could not create budget`, {
79-
userId: session.userId,
80-
exception,
81-
});
8270
throw new CreationFailed(Budget, { cause: exception });
8371
}
8472
}
@@ -98,16 +86,9 @@ export class BudgetService {
9886

9987
await this.verifyRecordUniqueness(input);
10088

101-
this.logger.debug('Creating BudgetRecord', input);
102-
10389
try {
10490
const recordId = await this.budgetRecordsRepo.create(input, changeset);
10591

106-
this.logger.debug(`Created Budget Record`, {
107-
id: recordId,
108-
userId: session.userId,
109-
});
110-
11192
const budgetRecord = await this.readOneRecord(
11293
recordId,
11394
session,
@@ -116,10 +97,6 @@ export class BudgetService {
11697

11798
return budgetRecord;
11899
} catch (exception) {
119-
this.logger.error(`Could not create Budget Record`, {
120-
userId: session.userId,
121-
exception,
122-
});
123100
throw new CreationFailed(BudgetRecord, { cause: exception });
124101
}
125102
}
@@ -136,11 +113,6 @@ export class BudgetService {
136113

137114
@HandleIdLookup(Budget)
138115
async readOne(id: ID, session: Session, view?: ObjectView): Promise<Budget> {
139-
this.logger.debug(`readOne budget`, {
140-
id,
141-
userId: session.userId,
142-
});
143-
144116
const result = await this.budgetRepo.readOne(id, session, view);
145117

146118
const privs = this.privileges.for(Budget, result);
@@ -190,11 +162,6 @@ export class BudgetService {
190162
session: Session,
191163
view?: ObjectView,
192164
): Promise<BudgetRecord> {
193-
this.logger.debug(`readOne BudgetRecord`, {
194-
id,
195-
userId: session.userId,
196-
});
197-
198165
const result = await this.budgetRecordsRepo.readOne(id, { session, view });
199166

200167
return this.privileges.for(BudgetRecord).secure(result);
@@ -220,8 +187,6 @@ export class BudgetService {
220187
session: Session,
221188
changeset?: ID,
222189
): Promise<BudgetRecord> {
223-
this.logger.debug('Update budget record', { id, userId: session.userId });
224-
225190
const br = await this.readOneRecord(
226191
id,
227192
session,
@@ -230,20 +195,8 @@ export class BudgetService {
230195
const changes = this.budgetRecordsRepo.getActualChanges(br, input);
231196
this.privileges.for(BudgetRecord, br).verifyChanges(changes);
232197

233-
try {
234-
const result = await this.budgetRecordsRepo.update(
235-
br,
236-
changes,
237-
changeset,
238-
);
239-
return result;
240-
} catch (e) {
241-
this.logger.error('Could not update budget Record ', {
242-
id,
243-
userId: session.userId,
244-
});
245-
throw e;
246-
}
198+
const result = await this.budgetRecordsRepo.update(br, changes, changeset);
199+
return result;
247200
}
248201

249202
async delete(id: ID, session: Session): Promise<void> {
@@ -257,21 +210,15 @@ export class BudgetService {
257210
try {
258211
await this.budgetRepo.deleteNode(budget);
259212
} catch (e) {
260-
this.logger.warning('Failed to delete budget', {
261-
exception: e,
262-
});
263-
throw new ServerException('Failed to delete budget');
213+
throw new ServerException('Failed to delete budget', e);
264214
}
265215
}
266216

267217
async deleteRecord(id: ID, session: Session, changeset?: ID): Promise<void> {
268218
try {
269219
await this.budgetRecordsRepo.deleteNode(id, { changeset });
270220
} catch (e) {
271-
this.logger.warning('Failed to delete Budget Record', {
272-
exception: e,
273-
});
274-
throw new ServerException('Failed to delete Budget Record');
221+
throw new ServerException('Failed to delete Budget Record', e);
275222
}
276223
}
277224

src/components/ceremony/ceremony.service.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
type Session,
88
type UnsecuredDto,
99
} from '~/common';
10-
import { HandleIdLookup, ILogger, Logger } from '~/core';
10+
import { HandleIdLookup } from '~/core';
1111
import { Privileges } from '../authorization';
1212
import { CeremonyRepository } from './ceremony.repository';
1313
import { Ceremony, type CreateCeremony, type UpdateCeremony } from './dto';
@@ -17,7 +17,6 @@ export class CeremonyService {
1717
constructor(
1818
private readonly privileges: Privileges,
1919
private readonly repo: CeremonyRepository,
20-
@Logger('ceremony:service') private readonly logger: ILogger,
2120
) {}
2221

2322
async create(input: CreateCeremony): Promise<ID> {
@@ -32,7 +31,6 @@ export class CeremonyService {
3231
session: Session,
3332
_view?: ObjectView,
3433
): Promise<Ceremony> {
35-
this.logger.debug(`Query readOne Ceremony`, { id, userId: session.userId });
3634
if (!id) {
3735
throw new InputException('No ceremony id to search for', 'ceremony.id');
3836
}
@@ -73,10 +71,7 @@ export class CeremonyService {
7371
try {
7472
await this.repo.deleteNode(object);
7573
} catch (exception) {
76-
this.logger.warning('Failed to delete Ceremony', {
77-
exception,
78-
});
79-
throw new ServerException('Failed to delete Ceremony');
74+
throw new ServerException('Failed to delete Ceremony', exception);
8075
}
8176
}
8277
}

src/components/engagement/handlers/set-initial-end-date.handler.ts

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
import { ServerException } from '~/common';
2-
import {
3-
ConfigService,
4-
EventsHandler,
5-
type IEventHandler,
6-
ILogger,
7-
Logger,
8-
} from '~/core';
2+
import { ConfigService, EventsHandler, type IEventHandler } from '~/core';
93
import { EngagementStatus, LanguageEngagement } from '../dto';
104
import { EngagementRepository } from '../engagement.repository';
11-
import { EngagementService } from '../engagement.service';
125
import { EngagementCreatedEvent, EngagementUpdatedEvent } from '../events';
136

147
type SubscribedEvent = EngagementCreatedEvent | EngagementUpdatedEvent;
@@ -17,19 +10,13 @@ type SubscribedEvent = EngagementCreatedEvent | EngagementUpdatedEvent;
1710
export class SetInitialEndDate implements IEventHandler<SubscribedEvent> {
1811
constructor(
1912
private readonly engagementRepo: EngagementRepository,
20-
private readonly engagementService: EngagementService,
2113
private readonly config: ConfigService,
22-
@Logger('engagement:set-initial-end-date') private readonly logger: ILogger,
2314
) {}
2415

2516
async handle(event: SubscribedEvent) {
2617
if (this.config.databaseEngine === 'gel') {
2718
return;
2819
}
29-
this.logger.debug('Engagement mutation, set initial end date', {
30-
...event,
31-
event: event.constructor.name,
32-
});
3320

3421
const engagement = 'engagement' in event ? event.engagement : event.updated;
3522

@@ -72,10 +59,6 @@ export class SetInitialEndDate implements IEventHandler<SubscribedEvent> {
7259
event.engagement = updatedEngagement;
7360
}
7461
} catch (exception) {
75-
this.logger.error(`Could not set initial end date on engagement`, {
76-
userId: event.session.userId,
77-
exception,
78-
});
7962
throw new ServerException(
8063
'Could not set initial end date on engagement',
8164
exception,

src/components/engagement/handlers/set-last-status-date.handler.ts

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
import { ServerException } from '~/common';
2-
import {
3-
ConfigService,
4-
EventsHandler,
5-
type IEventHandler,
6-
ILogger,
7-
Logger,
8-
} from '~/core';
2+
import { EventsHandler, type IEventHandler } from '~/core';
93
import { DatabaseService } from '~/core/database';
104
import { EngagementStatus, IEngagement } from '../dto';
115
import { EngagementUpdatedEvent } from '../events';
@@ -14,11 +8,7 @@ import { EngagementUpdatedEvent } from '../events';
148
export class SetLastStatusDate
159
implements IEventHandler<EngagementUpdatedEvent>
1610
{
17-
constructor(
18-
private readonly db: DatabaseService,
19-
private readonly config: ConfigService,
20-
@Logger('engagement:set-last-status-date') private readonly logger: ILogger,
21-
) {}
11+
constructor(private readonly db: DatabaseService) {}
2212

2313
async handle(event: EngagementUpdatedEvent) {
2414
const { previous, updated, session } = event;
@@ -49,13 +39,7 @@ export class SetLastStatusDate
4939
changes,
5040
});
5141
} catch (exception) {
52-
this.logger.error(`Could not set last status date`, {
53-
userId: session.userId,
54-
exception,
55-
});
56-
throw this.config.jest
57-
? exception
58-
: new ServerException('Could not set last status date', exception);
42+
throw new ServerException('Could not set last status date', exception);
5943
}
6044
}
6145
}

src/components/field-region/field-region.service.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
type Session,
77
type UnsecuredDto,
88
} from '~/common';
9-
import { HandleIdLookup, ILogger, Logger } from '~/core';
9+
import { HandleIdLookup } from '~/core';
1010
import { Privileges } from '../authorization';
1111
import {
1212
type CreateFieldRegion,
@@ -20,7 +20,6 @@ import { FieldRegionRepository } from './field-region.repository';
2020
@Injectable()
2121
export class FieldRegionService {
2222
constructor(
23-
@Logger('field-region:service') private readonly logger: ILogger,
2423
private readonly privileges: Privileges,
2524
private readonly repo: FieldRegionRepository,
2625
) {}
@@ -40,11 +39,6 @@ export class FieldRegionService {
4039
session: Session,
4140
_view?: ObjectView,
4241
): Promise<FieldRegion> {
43-
this.logger.debug(`Read Field Region`, {
44-
id: id,
45-
userId: session.userId,
46-
});
47-
4842
const result = await this.repo.readOne(id);
4943
return this.secure(result, session);
5044
}
@@ -79,7 +73,6 @@ export class FieldRegionService {
7973
try {
8074
await this.repo.deleteNode(object);
8175
} catch (exception) {
82-
this.logger.error('Failed to delete', { id, exception });
8376
throw new ServerException('Failed to delete', exception);
8477
}
8578
}

src/components/field-zone/field-zone.service.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
type Session,
77
type UnsecuredDto,
88
} from '~/common';
9-
import { HandleIdLookup, ILogger, Logger } from '~/core';
9+
import { HandleIdLookup } from '~/core';
1010
import { Privileges } from '../authorization';
1111
import {
1212
type CreateFieldZone,
@@ -20,7 +20,6 @@ import { FieldZoneRepository } from './field-zone.repository';
2020
@Injectable()
2121
export class FieldZoneService {
2222
constructor(
23-
@Logger('field-zone:service') private readonly logger: ILogger,
2423
private readonly privileges: Privileges,
2524
private readonly repo: FieldZoneRepository,
2625
) {}
@@ -37,11 +36,6 @@ export class FieldZoneService {
3736
session: Session,
3837
_view?: ObjectView,
3938
): Promise<FieldZone> {
40-
this.logger.debug(`Read Field Zone`, {
41-
id: id,
42-
userId: session.userId,
43-
});
44-
4539
const result = await this.repo.readOne(id);
4640
return this.secure(result, session);
4741
}
@@ -73,7 +67,6 @@ export class FieldZoneService {
7367
try {
7468
await this.repo.deleteNode(object);
7569
} catch (exception) {
76-
this.logger.error('Failed to delete', { id, exception });
7770
throw new ServerException('Failed to delete', exception);
7871
}
7972
}

src/components/file/file.service.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,10 @@ export class FileService {
113113
}
114114

115115
async getFileNode(id: ID, session?: Session): Promise<FileNode> {
116-
this.logger.debug(`getNode`, { id, userId: session?.userId });
117116
return await this.repo.getById(id);
118117
}
119118

120119
async getFileNodes(ids: readonly ID[], session: Session) {
121-
this.logger.debug(`getNodes`, { ids, userId: session.userId });
122120
return await this.repo.getByIds(ids);
123121
}
124122

0 commit comments

Comments
 (0)