-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #83 from ti-broish/protocols-data-v2
- Loading branch information
Showing
28 changed files
with
399 additions
and
899 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
src/migrations/1625769115216-AddProtocolDataResultsV2Columns.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| import { MigrationInterface, QueryRunner } from 'typeorm'; | ||
|
|
||
| export class AddProtocolDataResultsV2Columns1625769115216 | ||
| implements MigrationInterface | ||
| { | ||
| public async up(queryRunner: QueryRunner): Promise<void> { | ||
| await queryRunner.query(` | ||
| ALTER TABLE "protocol_results" add column "machine_votes" jsonb default null; | ||
| `); | ||
| await queryRunner.query(` | ||
| update "protocol_results" | ||
| set "machine_votes" = ('[' || "machine_votes_count" || ']')::jsonb | ||
| where "machine_votes_count" > 0; | ||
| `); | ||
| await queryRunner.query(` | ||
| alter table "protocols" add column "metadata" jsonb default null; | ||
| `); | ||
| await queryRunner.query(` | ||
| update "protocols" set "metadata" = json_build_object( | ||
| 'validVotesCount', "protocol_data"."valid_votes_count", | ||
| 'invalidVotesCount', "protocol_data"."invalid_votes_count", | ||
| 'machineVotesCount', "protocol_data"."machine_votes_count", | ||
| 'votersCount', "protocol_data"."voters_count" | ||
| ) | ||
| from "protocol_data" where protocol_data.protocol_id = protocols.id; | ||
| `); | ||
| await queryRunner.query(` | ||
| alter table "protocol_results" drop column "invalid_votes_count"; | ||
| `); | ||
| } | ||
|
|
||
| public async down(queryRunner: QueryRunner): Promise<void> { | ||
| await queryRunner.query(` | ||
| alter table "protocol_results" add column "invalid_votes_count" integer default null; | ||
| `); | ||
| await queryRunner.query(` | ||
| alter table "protocols" drop column "metadata"; | ||
| `); | ||
| await queryRunner.query(` | ||
| alter table "protocol_results" drop column "machine_votes"; | ||
| `); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| import { Expose, plainToClass, Transform, Type } from 'class-transformer'; | ||
| import { | ||
| ArrayNotEmpty, | ||
| IsArray, | ||
| IsInt, | ||
| IsNotEmpty, | ||
| IsNumber, | ||
| IsOptional, | ||
| Min, | ||
| ValidateNested, | ||
| } from 'class-validator'; | ||
| import { PartyDto } from '../../parties/api/party.dto'; | ||
| import { ProtocolResult } from '../entities/protocol-result.entity'; | ||
| import { Protocol } from '../entities/protocol.entity'; | ||
|
|
||
| export class ProtocolResultDto { | ||
| @Transform( | ||
| ({ value: id }) => plainToClass(PartyDto, { id }, { groups: ['create'] }), | ||
| { groups: ['create', 'replace'] }, | ||
| ) | ||
| @ValidateNested({ | ||
| groups: ['create', 'replace'], | ||
| }) | ||
| @Type(() => PartyDto) | ||
| @Expose({ groups: ['read', 'create', 'replace'] }) | ||
| party: PartyDto; | ||
|
|
||
| @Expose({ groups: ['read'] }) | ||
| validVotesCount: number; | ||
|
|
||
| @IsOptional({ groups: ['read', 'replace'] }) | ||
| @IsNumber({}, { each: true, groups: ['replace'] }) | ||
| @IsNotEmpty({ groups: ['replace'] }) | ||
| @Min(0, { each: true, groups: ['replace'] }) | ||
| @IsInt({ each: true, groups: ['replace'] }) | ||
| @Expose({ groups: ['read', 'replace'] }) | ||
| @IsArray({ groups: ['replace'] }) | ||
| @ArrayNotEmpty({ groups: ['replace'] }) | ||
| machineVotes?: number[]; | ||
|
|
||
| @IsOptional({ groups: ['read', 'replace'] }) | ||
| @IsNumber({}, { groups: ['replace'] }) | ||
| @IsNotEmpty({ groups: ['replace'] }) | ||
| @Min(0, { groups: ['replace'] }) | ||
| @IsInt({ groups: ['replace'] }) | ||
| @Expose({ groups: ['read', 'replace'] }) | ||
| nonMachineVotesCount?: number; | ||
|
|
||
| public toEntity(): ProtocolResult { | ||
| const protocolResult = plainToClass< | ||
| ProtocolResult, | ||
| Partial<ProtocolResultDto> | ||
| >(ProtocolResult, this, { | ||
| groups: ['create', 'replace'], | ||
| }); | ||
| const validVotes = (protocolResult.machineVotes || []).concat([ | ||
| protocolResult.nonMachineVotesCount || 0, | ||
| ]); | ||
|
|
||
| protocolResult.validVotesCount = validVotes.reduce( | ||
| (sum: number, votes: number): number => sum + votes, | ||
| ); | ||
|
|
||
| return protocolResult; | ||
| } | ||
|
|
||
| public static fromEntity(entity: ProtocolResult): ProtocolResultDto { | ||
| return plainToClass<ProtocolResultDto, Partial<Protocol>>( | ||
| ProtocolResultDto, | ||
| entity, | ||
| { | ||
| excludeExtraneousValues: true, | ||
| groups: ['read'], | ||
| }, | ||
| ); | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.