diff --git a/docs/dev/db-schema.plantuml b/docs/dev/db-schema.plantuml index 9527984f5..56063af26 100644 --- a/docs/dev/db-schema.plantuml +++ b/docs/dev/db-schema.plantuml @@ -58,7 +58,7 @@ entity "Session" as seesion { entity "Revision" { - *id : uuid <> + *id : number <> -- *noteId : uuid <> *content : text @@ -78,7 +78,7 @@ entity "Authorship" { } entity "RevisionAuthorship" { - *revisionId : uuid <> + *revisionId : number <> *authorshipId : uuid <> } diff --git a/src/revisions/revision-metadata.dto.ts b/src/revisions/revision-metadata.dto.ts index 897e64501..68c2cda65 100644 --- a/src/revisions/revision-metadata.dto.ts +++ b/src/revisions/revision-metadata.dto.ts @@ -2,7 +2,7 @@ import { IsDate, IsNumber, IsString } from 'class-validator'; import { Revision } from './revision.entity'; export class RevisionMetadataDto { - @IsString() + @IsNumber() id: Revision['id']; @IsDate() diff --git a/src/revisions/revision.dto.ts b/src/revisions/revision.dto.ts index c917f8990..faff5e6ba 100644 --- a/src/revisions/revision.dto.ts +++ b/src/revisions/revision.dto.ts @@ -1,8 +1,8 @@ -import { IsString } from 'class-validator'; +import { IsNumber, IsString } from 'class-validator'; import { Revision } from './revision.entity'; export class RevisionDto { - @IsString() + @IsNumber() id: Revision['id']; @IsString() content: string; diff --git a/src/revisions/revision.entity.ts b/src/revisions/revision.entity.ts index 2c15515af..4cf7a93ba 100644 --- a/src/revisions/revision.entity.ts +++ b/src/revisions/revision.entity.ts @@ -16,8 +16,8 @@ import { Authorship } from './authorship.entity'; */ @Entity() export class Revision { - @PrimaryGeneratedColumn('uuid') - id: string; + @PrimaryGeneratedColumn() + id: number; /** * The patch from the previous revision to this one. diff --git a/src/revisions/revisions.service.ts b/src/revisions/revisions.service.ts index dad768872..167274fc4 100644 --- a/src/revisions/revisions.service.ts +++ b/src/revisions/revisions.service.ts @@ -16,14 +16,14 @@ export class RevisionsService { this.logger.warn('Using hardcoded data!'); return [ { - id: 'some-uuid', + id: 42, updatedAt: new Date(), length: 42, }, ]; } - getNoteRevision(noteIdOrAlias: string, revisionId: string): RevisionDto { + getNoteRevision(noteIdOrAlias: string, revisionId: number): RevisionDto { this.logger.warn('Using hardcoded data!'); return { id: revisionId, @@ -39,6 +39,7 @@ export class RevisionsService { }, order: { createdAt: 'DESC', + id: 'DESC', }, }); }