fixed worker

andrefs · Oct 18, 2023 · 83c358b · 83c358b
1 parent ab57b74
commit 83c358b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/models/Resource.ts b/src/models/Resource.ts
@@ -37,8 +37,8 @@ class ResourceClass {
   })
   public status!: 'unvisited' | 'done' | 'crawling' | 'error';
 
-  @prop({ ref: 'Triple' })
-  public triples?: Types.DocumentArray<TripleClass>;
+  @prop({ ref: 'Triple', default: [] })
+  public triples!: Types.DocumentArray<TripleClass>;
 
   @prop()
   public jobId?: number;

diff --git a/src/models/Triple.ts b/src/models/Triple.ts
@@ -12,6 +12,8 @@ import {
 } from '@typegoose/typegoose';
 import { Document } from 'cheerio';
 
+type TripleSkeleton = Pick<TripleClass, 'subject' | 'predicate' | 'object'>;
+
 @ModelOptions({
   schemaOptions: {
     timestamps: true,
@@ -24,7 +26,6 @@ import { Document } from 'cheerio';
 @index({ nodes: 1 })
 @index({ subject: 1, predicate: 1, object: 1 }, { unique: true })
 
-  type TripleSkeleton = Pick<TripleClass, 'subject' | 'predicate' | 'object'>;
 
 class TripleClass {
   _id!: mongoose.Types.ObjectId;

diff --git a/src/worker/lib/Worker.ts b/src/worker/lib/Worker.ts
@@ -4,7 +4,7 @@ import Bluebird from 'bluebird';
 import EventEmitter from 'events';
 import robotsParser, { Robot } from 'robots-parser';
 import * as db from './db';
-import { IResource, Resource } from '@derzis/models';
+import { Resource } from '@derzis/models';
 
 import Axios from './axios';
 

diff --git a/src/worker/lib/WorkerPubSub.ts b/src/worker/lib/WorkerPubSub.ts
@@ -8,8 +8,8 @@ import { JobCapacity, JobResult, JobType, Worker } from './Worker';
 import { createLogger } from '@derzis/common';
 import { MonkeyPatchedLogger } from '@derzis/common';
 let log: MonkeyPatchedLogger;
-import { IDomain } from '@derzis/models';
 import { OngoingJobs } from '@derzis/manager';
+import { DomainClass } from 'src/models';
 
 export interface BaseJobRequest {
   type: JobType;
@@ -25,7 +25,7 @@ export interface ResourceCrawlJobRequest extends BaseJobRequest {
   url: string;
 }
 export interface DomainCrawlJobInfo {
-  domain: IDomain;
+  domain: DomainClass;
   resources: { url: string }[];
 }
 export type DomainCrawlJobRequest = BaseJobRequest &