diff --git a/Dockerfile b/Dockerfile index 61613ca..f1f80a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM ghcr.io/puppeteer/puppeteer:latest AS base USER root RUN apt-get update && \ apt-get install curl -y --no-install-recommends -RUN mv ~/.cache/puppeteer/chrome /opt/chromium +RUN mv /home/pptruser/.cache/puppeteer/chrome /opt/chromium ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" RUN corepack enable diff --git a/src/controller/Election.ts b/src/controller/Election.ts index b069f44..5ec9f33 100644 --- a/src/controller/Election.ts +++ b/src/controller/Election.ts @@ -11,7 +11,6 @@ import { makeSHA } from 'web-utility'; import { dataSource, User, Voter, VoteTicket } from '../model'; import { lark, MemberBiDataTable } from '../utility'; -import { ActivityLogController } from './ActivityLog'; @JsonController('/election') export class ElectionController { @@ -44,9 +43,7 @@ export class ElectionController { throw new ForbiddenError( `${nickName} isn't a formal member who has the right to vote in ${electionName} election` ); - const saved = await this.voterStore.save({ electionName, createdBy }); - - await ActivityLogController.logCreate(createdBy, 'Voter', saved.id); + await this.voterStore.save({ electionName, createdBy }); const meta = [ nickName, diff --git a/src/model/ActivityLog.ts b/src/model/ActivityLog.ts index a49e394..d568e3e 100644 --- a/src/model/ActivityLog.ts +++ b/src/model/ActivityLog.ts @@ -12,7 +12,6 @@ import { Column, Entity, ViewColumn, ViewEntity } from 'typeorm'; import { Base, BaseFilter, InputData, ListChunk } from './Base'; import { CheckEvent } from './CheckEvent'; import { User, UserBase } from './User'; -import { Voter } from './Election'; export enum Operation { Create = 'create', @@ -20,7 +19,7 @@ export enum Operation { Delete = 'delete' } -export const LogableTable = { User, CheckEvent, Voter }; +export const LogableTable = { User, CheckEvent }; const LogableTableEnum = Object.fromEntries( Object.entries(LogableTable).map(([key]) => [key, key])