checkpoint

Signed-off-by: Andrey Platov <andrey@hardcoreeng.com>

plugins/recruit-resources/src/components/Attachments.svelte

@@ -40,10 +40,11 @@
   const client = getClient()
 
   async function createAttachment(file: File) {
+    console.log('CREATE ATTACHMENT')
     loading = true
     try {
       const id = generateId<Attachment>()
-      const uuid = await uploadFile(id, object.space, file)
+      const uuid = await uploadFile(id, object.space, file, object._id)
       console.log('uploaded file uuid', uuid)
       client.createDoc(chunter.class.Attachment, object.space, {
         attachedTo: object._id,

plugins/recruit-resources/src/components/CreateCandidate.svelte

@@ -15,7 +15,7 @@
 
 <script lang="ts">
   import { createEventDispatcher } from 'svelte'
-  import type { Ref, Space, Doc } from '@anticrm/core'
+  import type { Ref, Space } from '@anticrm/core'
   import { generateId } from '@anticrm/core'
 
   import { getClient, Card, Channels } from '@anticrm/presentation'
@@ -58,16 +58,17 @@
 
   const dispatch = createEventDispatcher()
   const client = getClient()
+  const candidateId = generateId<Candidate>()
 
   async function createCandidate() {
     console.log(_space)
     // create candidate      
-    const candidateId = await client.createDoc(recruit.class.Candidate, _space, {
+    await client.createDoc(recruit.class.Candidate, _space, {
       firstName: object.firstName,
       lastName: object.lastName,
       city: object.city,
       channels: object.channels,
-    })
+    }, candidateId)
 
     console.log('resume name', resume.name)
 
@@ -98,7 +99,7 @@
     loading = true
     try {
       const id = generateId<Attachment>()
-      resume.uuid = await uploadFile(id, space, file)
+      resume.uuid = await uploadFile(id, space, file, candidateId)
       resume.id = id
       resume.name = file.name
       resume.size = file.size

plugins/recruit-resources/src/utils.ts

@@ -19,14 +19,14 @@ import { getMetadata } from '@anticrm/platform'
 
 import login from '@anticrm/login'
 
-export async function uploadFile(id: Ref<Doc>, space: Ref<Space>, file: File): Promise<string> {
+export async function uploadFile(id: Ref<Doc>, space: Ref<Space>, file: File, attachedTo: Ref<Doc>): Promise<string> {
   console.log(file)
   const uploadUrl = getMetadata(login.metadata.UploadUrl)
   
   const data = new FormData()
   data.append('file', file)
 
-  const url = `${uploadUrl}?id=${id}&space=${space}`
+  const url = `${uploadUrl}?id=${id}&space=${space}&attachedTo=${attachedTo}`
   const resp = await fetch(url, {
     method: 'POST',
     headers: {

server/core/src/fulltext.ts

@@ -15,8 +15,9 @@
 //
 
 import { TxCreateDoc, Doc, Ref, Class, Obj, Hierarchy, AnyAttribute, Storage, DocumentQuery, FindOptions, FindResult, TxProcessor, IndexKind } from '@anticrm/core'
+import type { AttachedDoc } from '@anticrm/core'
 
-import type { IndexedContent, FullTextAdapter, WithFind } from './types'
+import type { IndexedDoc, FullTextAdapter, WithFind } from './types'
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
 const NO_INDEX = {} as AnyAttribute
@@ -35,8 +36,9 @@ export class FullTextIndex extends TxProcessor implements Storage {
   async findAll<T extends Doc> (_class: Ref<Class<T>>, query: DocumentQuery<T>, options?: FindOptions<T>): Promise<FindResult<T>> {
     console.log('search', query)
     const docs = await this.adapter.search(query)
-    const ids = docs.map(doc => doc.id as Ref<T>)
+    console.log(docs)
-    return this.dbStorage.findAll(_class, { _id: { $in: ids as any } }, options)
+    const ids = docs.map(doc => (doc.attachedTo ?? doc.id) as Ref<T>)
+    return this.dbStorage.findAll(_class, { _id: { $in: ids as any } }, options) // TODO: remove `as any`
   }
 
   private findFullTextAttribute (clazz: Ref<Class<Obj>>): AnyAttribute | undefined {
@@ -60,12 +62,13 @@ export class FullTextIndex extends TxProcessor implements Storage {
     if (attribute === undefined) return
     const doc = TxProcessor.createDoc2Doc(tx)
     const content = (doc as any)[attribute.name]
-    const indexedDoc: IndexedContent = {
+    const indexedDoc: IndexedDoc = {
       id: doc._id,
       _class: doc._class,
       modifiedBy: doc.modifiedBy,
       modifiedOn: doc.modifiedOn,
       space: doc.space,
+      attachedTo: (doc as AttachedDoc).attachedTo,
       content
     }
     return await this.adapter.index(indexedDoc)

server/core/src/types.ts

@@ -39,26 +39,15 @@ export interface IndexedDoc {
   space: Ref<Space>
   modifiedOn: Timestamp
   modifiedBy: Ref<Account>
+  attachedTo?: Ref<Doc>
+  content?: string
+  data?: string
 }
 
 /**
  * @public
  */
-export interface IndexedContent extends IndexedDoc {
+export type SearchQuery = any // TODO: replace with DocumentQuery
-  content: string
-}
-
-/**
- * @public
- */
-export interface IndexedAttachment extends IndexedDoc {
-  data: string
-}
-
-/**
- * @public
- */
-export type SearchQuery = any
 
 /**
  * @public

server/elastic/src/__tests__/adapter.test.ts

@@ -16,12 +16,12 @@
 
 import type { Ref, Doc, Class, Obj, Account, Space } from '@anticrm/core'
 import { createElasticAdapter } from '../adapter'
-import type { IndexedContent } from '@anticrm/server-core'
+import type { IndexedDoc } from '@anticrm/server-core'
 
 describe('client', () => {
   it('should create document', async () => {
     const adapter = await createElasticAdapter('http://localhost:9200/', 'ws1')
-    const doc: IndexedContent = {
+    const doc: IndexedDoc = {
       id: 'doc1' as Ref<Doc>,
       _class: 'class1' as Ref<Class<Obj>>,
       modifiedBy: 'andrey' as Ref<Account>,

server/elastic/src/adapter.ts

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-import type { FullTextAdapter, IndexedAttachment, IndexedDoc, SearchQuery } from '@anticrm/server-core'
+import type { FullTextAdapter, IndexedDoc, SearchQuery } from '@anticrm/server-core'
 
 import { Client } from '@elastic/elasticsearch'
 
@@ -32,9 +32,9 @@ class ElasticAdapter implements FullTextAdapter {
       index: this.db,
       body: {
         query: {
-          match: {
+          multi_match: {
-            content: query.$search
+            query: query.$search,
-            // 'attachment.content': query.$search
+            fields: ['content', 'attachment.content']
           }
         }
       }
@@ -46,13 +46,14 @@ class ElasticAdapter implements FullTextAdapter {
 
   async index (doc: IndexedDoc): Promise<void> {
     console.log('eastic: index', doc)
-    if ((doc as IndexedAttachment).data === undefined) {
+    if (doc.data === undefined) {
       const resp = await this.client.index({
         index: this.db,
         type: '_doc',
         body: doc
       })
-      console.log(resp)
+      console.log('resp', resp)
+      console.log('error', (resp.meta as any)?.body?.error)
     } else {
       console.log('attachment pipeline')
       const resp = await this.client.index({
@@ -61,7 +62,8 @@ class ElasticAdapter implements FullTextAdapter {
         pipeline: 'attachment',
         body: doc
       })
-      console.log(resp)
+      console.log('resp', resp)
+      console.log('error', (resp.meta as any)?.body?.error)
     }
   }
 }

server/upload/package.json

@@ -8,7 +8,7 @@
     "start": "ts-node src/__start.ts",
     "build": "heft build",
     "lint:fix": "eslint --fix src",
-    "bundle": "esbuild src/__start.ts --bundle --minify --platform=node > bundle.js",
+    "bundle": "esbuild src/__start.ts --bundle --platform=node > bundle.js",
     "docker:build": "docker build -t anticrm/upload .",
     "docker:push": "docker push anticrm/upload"
   },

server/upload/src/app.ts

@@ -22,7 +22,7 @@ import { decode } from 'jwt-simple'
 
 import type { Space, Ref, Doc, Account } from '@anticrm/core'
 // import { TxFactory } from '@anticrm/core'
-import type { Token, IndexedAttachment } from '@anticrm/server-core'
+import type { Token, IndexedDoc } from '@anticrm/server-core'
 import { createElasticAdapter } from '@anticrm/elastic'
 import chunter from '@anticrm/chunter'
 // import { createContributingClient } from '@anticrm/contrib'
@@ -133,6 +133,7 @@ export function start (transactorEndpoint: string, elasticUrl: string, minio: Cl
 
       const id = req.query.id as Ref<Doc>
       const space = req.query.space as Ref<Space>
+      const attachedTo = req.query.attachedTo as Ref<Doc>
       // const name = req.query.name as string
 
       // await createAttachment(
@@ -148,12 +149,13 @@ export function start (transactorEndpoint: string, elasticUrl: string, minio: Cl
 
       const elastic = await createElasticAdapter(elasticUrl, payload.workspace)
 
-      const indexedDoc: IndexedAttachment = {
+      const indexedDoc: IndexedDoc = {
         id,
         _class: chunter.class.Attachment,
         space,
         modifiedOn: Date.now(),
         modifiedBy: 'core:account:System' as Ref<Account>,
+        attachedTo,
         data: file.data.toString('base64')
       }