fix: Building

packages/daf-core/src/core.ts

@@ -7,7 +7,7 @@ import { ServiceControllerDerived } from './service/abstract-service-controller'
 import { MessageValidator, unsupportedMessageTypeError } from './message/abstract-message-validator'
 import { ActionHandler } from './action/action-handler'
 import { Action } from './types'
-import { Message } from './message/message'
+import { Message } from './entities/message'
 
 import Debug from 'debug'
 const debug = Debug('daf:core')

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

@@ -9,8 +9,8 @@ export class MessageMetaData extends BaseEntity {
   @Column()
   type: string
 
-  @Column()
-  value: string
+  @Column({ nullable: true })
+  value?: string
 
   @ManyToOne(
     type => Message,

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

@@ -17,6 +17,16 @@ import { Credential } from './credential'
 
 @Entity()
 export class Message extends BaseEntity {
+  constructor(data?: { raw: string; meta?: { type: string; value?: string } }) {
+    super()
+    if (data?.raw) {
+      this.raw = data.raw
+    }
+    if (data?.meta) {
+      this.addMetaData(data.meta)
+    }
+  }
+
   @PrimaryGeneratedColumn('uuid')
   id: string
 
@@ -42,7 +52,7 @@ export class Message extends BaseEntity {
   raw: string
 
   @Column('simple-json', { nullable: true })
-  data?: object
+  data?: any
 
   // https://github.com/decentralized-identity/didcomm-messaging/blob/41f35f992275dd71d459504d14eb8d70b4185533/jwm.md#jwm-profile
 
@@ -101,4 +111,35 @@ 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
+    }
+    if (this.metaData) {
+      this.metaData.push(meta)
+    } else {
+      this.metaData = [meta]
+    }
+  }
+
+  getLastMetaData(): MessageMetaData | null {
+    if (this.metaData?.length > 0) {
+      return this.metaData[this.metaData.length - 1]
+    } else {
+      return null
+    }
+  }
+
+  isValid() {
+    if (this.type === null || this.type === '') {
+      return false
+    }
+    if (!this.raw || this.raw === null || this.raw === '') {
+      return false
+    }
+    return true
+  }
 }

packages/daf-core/src/graphql/graphql-core.ts

@@ -1,7 +1,7 @@
 import { Core } from '../core'
 import { LastMessageTimestampForInstance } from '../service/service-manager'
 
-import { Message } from '../message/message'
+import { Message } from '../entities/message'
 
 export interface Context {
   core: Core
@@ -17,7 +17,7 @@ const newMessage = async (
       raw: args.raw,
       meta: {
         type: args.sourceType,
-        id: args.sourceId,
+        value: args.sourceId,
       },
     }),
   )
@@ -29,13 +29,14 @@ const serviceMessagesSince = async (
   ctx: Context,
 ) => {
   const res = await ctx.core.getMessagesSince(args.ts)
-  return res.map(msg => ({
-    ...msg,
-    id: msg.id,
-    data: JSON.stringify(msg.data),
-    raw: msg.raw,
-    metaData: msg.allMeta,
-  }))
+  return [] // FIXME
+  // return res.map(msg => ({
+  //   ...msg,
+  //   id: msg.id,
+  //   data: JSON.stringify(msg.data),
+  //   raw: msg.raw,
+  //   metaData: msg.allMeta,
+  // }))
 }
 
 export const resolvers = {

packages/daf-core/src/index.ts

@@ -12,7 +12,6 @@ export {
 export { AbstractIdentityStore, SerializedIdentity } from './identity/abstract-identity-store'
 export { AbstractKeyStore } from './identity/abstract-key-store'
 export { AbstractMessageValidator } from './message/abstract-message-validator'
-export { Message } from './message/message'
 export { ServiceManager, LastMessageTimestampForInstance, ServiceEventTypes } from './service/service-manager'
 export { AbstractServiceController } from './service/abstract-service-controller'
 export { Gql } from './graphql/index'
@@ -25,3 +24,4 @@ export { Action } from './types'
 export { Claim } from './entities/claim'
 export { Credential } from './entities/credential'
 export { Presentation } from './entities/presentation'
+export { Message } from './entities/message'

packages/daf-core/src/message/__tests__/abstract-message-validator.test.ts

@@ -1,6 +1,6 @@
 import { AbstractMessageValidator, unsupportedMessageTypeError } from '../abstract-message-validator'
 import { Core } from '../../core'
-import { Message } from '../message'
+import { Message } from '../../entities/message'
 
 class MockMessageValidator extends AbstractMessageValidator {
   async validate(message: Message, core: Core) {

packages/daf-core/src/message/abstract-message-validator.ts

@@ -1,4 +1,4 @@
-import { Message } from './message'
+import { Message } from '../entities/message'
 import { Core } from '../core'
 
 export interface MessageValidator {

packages/daf-core/src/service/__tests__/abstract-service-controller.test.ts

@@ -2,7 +2,7 @@ import { AbstractServiceController } from '../abstract-service-controller'
 import { ServiceEventTypes } from '../service-manager'
 import { AbstractIdentity } from '../../identity/abstract-identity'
 import { Resolver } from '../../core'
-import { Message } from '../../message/message'
+import { Message } from '../../entities/message'
 
 describe('dummy', () => {
   const a = 100

packages/daf-core/src/service/abstract-service-controller.ts

@@ -1,7 +1,7 @@
 import { EventEmitter } from 'events'
 import { AbstractIdentity } from '../identity/abstract-identity'
 import { Resolver } from '../core'
-import { Message } from '../message/message'
+import { Message } from '../entities/message'
 
 export abstract class AbstractServiceController extends EventEmitter {
   constructor(readonly identity: AbstractIdentity, readonly didResolver: Resolver) {

packages/daf-core/src/service/service-manager.ts

@@ -2,7 +2,7 @@ import { EventEmitter } from 'events'
 import { Resolver } from '../core'
 import { AbstractServiceController, ServiceControllerDerived } from './abstract-service-controller'
 import { AbstractIdentity } from '../identity/abstract-identity'
-import { Message } from '../message/message'
+import { Message } from '../entities/message'
 import Debug from 'debug'
 const debug = Debug('daf:service-manager')