fix: Removing MessageMetaData entity

packages/daf-core/src/__tests__/entities.test.ts

@@ -1,5 +1,5 @@
 import { createConnection, Connection, In } from 'typeorm'
-import { Identity, Key, Message, Credential, Presentation, Claim, MessageMetaData } from '../index'
+import { Identity, Key, Message, Credential, Presentation, Claim } from '../index'
 import { Entities } from '../index'
 import { blake2bHex } from 'blakejs'
 import fs from 'fs'
@@ -154,7 +154,7 @@ describe('daf-core', () => {
 
     await message.save()
 
-    const fromDb = await Message.findOne(customId, { relations: ['metaData'] })
+    const fromDb = await Message.findOne(customId)
 
     expect(fromDb.id).toEqual(customId)
     expect(fromDb.type).toEqual('custom')

packages/daf-core/src/entities/message.ts

@@ -11,10 +11,14 @@ import {
   UpdateDateColumn,
 } from 'typeorm'
 import { Identity } from './identity'
-import { MessageMetaData } from './message-meta-data'
 import { Presentation } from './presentation'
 import { Credential } from './credential'
 
+export interface MetaData {
+  type: string
+  value?: string
+}
+
 @Entity()
 export class Message extends BaseEntity {
   constructor(data?: { raw: string; meta?: { type: string; value?: string } }) {
@@ -82,14 +86,8 @@ export class Message extends BaseEntity {
   )
   to?: Identity
 
-  @OneToMany(
-    type => MessageMetaData,
-    messageMetaData => messageMetaData.message,
-    {
-      cascade: true,
-    },
-  )
-  metaData: MessageMetaData[]
+  @Column('simple-json', { nullable: true })
+  metaData?: MetaData[]
 
   @ManyToMany(
     type => Presentation,
@@ -107,20 +105,15 @@ export class Message extends BaseEntity {
   @JoinTable()
   credentials: Credential[]
 
-  addMetaData(input: { type: string; value?: string }) {
-    const meta = new MessageMetaData()
-    meta.type = input.type
-    if (input.value) {
-      meta.value = input.value
-    }
+  addMetaData(meta: MetaData) {
     if (this.metaData) {
       this.metaData.push(meta)
     } else {
       this.metaData = [meta]
     }
   }
 
-  getLastMetaData(): MessageMetaData | null {
+  getLastMetaData(): MetaData | null {
     if (this.metaData?.length > 0) {
       return this.metaData[this.metaData.length - 1]
     } else {

packages/daf-core/src/graphql/graphql-base-type-defs.ts

@@ -22,7 +22,6 @@ export const baseTypeDefs = `
   }
 
   type MessageMetaData {
-    id: ID!
     type: String!
     value: String
   }

packages/daf-data-store/src/data-store.ts

@@ -1,4 +1,4 @@
-import { Identity, Message, MessageMetaData, Credential, Presentation, Claim } from 'daf-core'
+import { Identity, Message, Credential, Presentation, Claim } from 'daf-core'
 import { In } from 'typeorm'
 import Debug from 'debug'
 
@@ -124,6 +124,11 @@ export class DataStore {
       where.push({ to: receiver })
     }
 
+    if (sender || receiver) {
+      // SDR can have empty to field
+      where.push({ to: null })
+    }
+
     const messages = await Message.find({
       where,
       order: { saveDate: 'DESC' },
@@ -161,25 +166,8 @@ export class DataStore {
   }
 
   async latestMessageTimestamps() {
-    const innerQb = await Message.createQueryBuilder('message')
-      .leftJoinAndSelect('message.metaData', 'meta')
-      .orderBy('message.createdAt', 'DESC')
-
-    const res = await Message.createQueryBuilder()
-      .select('message_toDid as did, meta_type as type, meta_value as value, message_createdAt as createdAt')
-      .from('(' + innerQb.getQuery() + ')', 'inner')
-      .setParameters(innerQb.getParameters())
-      .groupBy('message_toDid')
-      .addGroupBy('meta_type')
-      .addGroupBy('meta_value')
-      .getRawMany()
-
-    return res.map(item => ({
-      did: item.did,
-      type: item.type,
-      id: item.value,
-      timestamp: Math.round(new Date(item.createdAt).getTime() / 1000),
-    }))
+    // FIXME
+    return []
   }
 
   async shortId(did: string) {
@@ -209,12 +197,9 @@ export class DataStore {
     return credential.messages.map(this.messageToLegacyFormat)
   }
 
-  async messageMetaData(id: string) {
-    const messages = await Message.findOne(id, {
-      relations: ['metaData'],
-    })
-
-    return messages.metaData
+  async metaData(id: string) {
+    const message = await Message.findOne(id)
+    return message.metaData
   }
 
   async deleteMessage(id: string) {

packages/daf-data-store/src/graphql.ts

@@ -7,7 +7,7 @@ export interface Context {
 export const resolvers = {
   Message: {
     vc: async (message: any, {}, { dataStore }: Context) => dataStore.credentialsForMessageId(message.id),
-    metaData: async (message: any, {}, { dataStore }: Context) => dataStore.messageMetaData(message.id),
+    metaData: async (message: any, {}, { dataStore }: Context) => dataStore.metaData(message.id),
     thread: async (message: any, {}, { dataStore }: Context) => {
       if (!message.threadId) {
         return []

packages/daf-did-jwt/src/message-validator.ts

@@ -1,4 +1,4 @@
-import { Core, AbstractMessageValidator, Message, MessageMetaData } from 'daf-core'
+import { Core, AbstractMessageValidator, Message } from 'daf-core'
 import { verifyJWT, decodeJWT } from 'did-jwt'
 import Debug from 'debug'
 const debug = Debug('daf:did-jwt:message-validator')