Merge pull request #707 from hedgedoc/feat/note-created-at

src/notes/notes.service.ts

@@ -13,7 +13,7 @@ import { Revision } from '../revisions/revision.entity';
 import { RevisionsService } from '../revisions/revisions.service';
 import { User } from '../users/user.entity';
 import { UsersService } from '../users/users.service';
-import { NoteMetadataDto, NoteMetadataUpdateDto } from './note-metadata.dto';
+import { NoteMetadataDto } from './note-metadata.dto';
 import {
   NotePermissionsDto,
   NotePermissionsUpdateDto,
@@ -97,21 +97,24 @@ export class NotesService {
   }
 
   async getCurrentContent(note: Note) {
-    return (await this.getLastRevision(note)).content;
+    return (await this.getLatestRevision(note)).content;
   }
 
-  async getLastRevision(note: Note): Promise<Revision> {
+  async getLatestRevision(note: Note): Promise<Revision> {
     return this.revisionsService.getLatestRevision(note.id);
   }
 
+  async getFirstRevision(note: Note): Promise<Revision> {
+    return this.revisionsService.getFirstRevision(note.id);
+  }
+
   async getMetadata(note: Note): Promise<NoteMetadataDto> {
     return {
       // TODO: Convert DB UUID to base64
       id: note.id,
       alias: note.alias,
       title: note.title,
-      // TODO: Get actual createTime
+      createTime: (await this.getFirstRevision(note)).createdAt,
-      createTime: new Date(),
       description: note.description,
       editedBy: note.authorColors.map(
         (authorColor) => authorColor.user.userName,
@@ -129,7 +132,7 @@ export class NotesService {
         })),
       },
       tags: note.tags.map((tag) => tag.name),
-      updateTime: (await this.getLastRevision(note)).createdAt,
+      updateTime: (await this.getLatestRevision(note)).createdAt,
       // TODO: Get actual updateUser
       updateUser: {
         displayName: 'Hardcoded User',

src/revisions/revisions.service.ts

@@ -62,6 +62,17 @@ export class RevisionsService {
     });
   }
 
+  getFirstRevision(noteId: string): Promise<Revision> {
+    return this.revisionRepository.findOne({
+      where: {
+        note: noteId,
+      },
+      order: {
+        createdAt: 'ASC',
+      },
+    });
+  }
+
   toMetadataDto(revision: Revision): RevisionMetadataDto {
     return {
       id: revision.id,

test/public-api/notes.e2e-spec.ts

@@ -120,7 +120,8 @@ describe('Notes', () => {
       .expect(404);
   });
 
-  it(`GET /notes/{note}/metadata`, async () => {
+  describe('GET /notes/{note}/metadata', () => {
+    it(`returns complete metadata object`, async () => {
       await notesService.createNote('This is a test note.', 'test6');
       const metadata = await request(app.getHttpServer())
         .get('/notes/test6/metadata')
@@ -150,6 +151,26 @@ describe('Notes', () => {
         .expect(404);
     });
 
+    it('has the correct update/create dates', async () => {
+      // create a note
+      const note = await notesService.createNote(
+        'This is a test note.',
+        'test6a',
+      );
+      // save the creation time
+      const createDate = (await note.revisions)[0].createdAt;
+      // wait one second
+      await new Promise((r) => setTimeout(r, 1000));
+      // update the note
+      await notesService.updateNoteByIdOrAlias('test6a', 'More test content');
+      const metadata = await request(app.getHttpServer())
+        .get('/notes/test6a/metadata')
+        .expect(200);
+      expect(metadata.body.createTime).toEqual(createDate.toISOString());
+      expect(metadata.body.updateTime).not.toEqual(createDate.toISOString());
+    });
+  });
+
   it(`GET /notes/{note}/revisions`, async () => {
     await notesService.createNote('This is a test note.', 'test7');
     const response = await request(app.getHttpServer())
@@ -167,7 +188,7 @@ describe('Notes', () => {
 
   it(`GET /notes/{note}/revisions/{revision-id}`, async () => {
     const note = await notesService.createNote('This is a test note.', 'test8');
-    const revision = await notesService.getLastRevision(note);
+    const revision = await notesService.getLatestRevision(note);
     const response = await request(app.getHttpServer())
       .get('/notes/test8/revisions/' + revision.id)
       .expect('Content-Type', /json/)