Merge pull request #37 from Project-OMOTES/WouterSpaak/issue34

Change queue name for job cancellations to job deletions for upcoming OMOTES release 0.0.9

Author: WouterSpaak

package-lock.json

@@ -83,7 +83,7 @@
     "@nestjs/common": "^10.0.2",
     "@nestjs/core": "^10.0.2",
     "@nestjs/platform-express": "^10.0.2",
-    "@omotes/proto": "^0.1.14",
+    "@omotes/proto": "^1.2.0",
     "amqplib": "^0.10.3",
     "axios": "^1.6.0",
     "express": "^4.18.1",

package.json

@@ -11,7 +11,7 @@
     "amqplib": "0.10.3",
     "uuidv7": "0.6.3",
     "tslib": "2.6.2",
-    "@omotes/proto": "^0.1.14",
+    "@omotes/proto": "^1.2.0",
     "google-protobuf": "^3.21.2",
     "influx": "^5.9.3"
   },

sdk/package.json

@@ -1,4 +1,4 @@
-import { JobCancel, JobSubmission } from '@omotes/proto';
+import { JobDelete, JobSubmission } from '@omotes/proto';
 import { Channel, Connection } from 'amqplib';
 import { MockChannel, MockConnection } from '../util/MockChannel.spec';
 import { Job } from './Job';
@@ -32,10 +32,10 @@ describe('Job', () => {
 
   describe('#cancel', () => {
     it('should send job cancel', () => {
-      job.cancel();
-      expect(channel.sendToQueue).toHaveBeenCalledWith('job_cancellations', expect.any(Buffer), { persistent: true });
+      job.delete();
+      expect(channel.sendToQueue).toHaveBeenCalledWith('job_deletions', expect.any(Buffer), { persistent: true });
       const submission = channel.sendToQueue.mock.calls[0][1];
-      const message = JobCancel.deserializeBinary(submission);
+      const message = JobDelete.deserializeBinary(submission);
       expect(message.toObject()).toEqual(expect.objectContaining({
         uuid: job.uuid
       }));

sdk/src/lib/Job.spec.ts

@@ -1,4 +1,4 @@
-import { JobCancel, JobSubmission, Workflow } from '@omotes/proto';
+import { JobDelete, JobSubmission, Workflow } from '@omotes/proto';
 import { Channel, Connection } from 'amqplib';
 import { JavaScriptValue, Struct } from 'google-protobuf/google/protobuf/struct_pb';
 import { from } from 'rxjs';
@@ -33,10 +33,10 @@ export class Job {
     return this;
   }
 
-  public cancel() {
-    const cancel = new JobCancel();
-    cancel.setUuid(this.uuid);
-    this.channel.sendToQueue(getCancellationsQueue(), this.toBuffer(cancel), { persistent: true });
+  public delete() {
+    const jobDelete = new JobDelete();
+    jobDelete.setUuid(this.uuid);
+    this.channel.sendToQueue(getCancellationsQueue(), this.toBuffer(jobDelete), { persistent: true });
     return this;
   }
 
@@ -72,7 +72,7 @@ export class Job {
     return channel;
   }
 
-  private toBuffer(message: JobSubmission | JobCancel) {
+  private toBuffer(message: JobSubmission | JobDelete) {
     return Buffer.from(message.serializeBinary());
   }
 

sdk/src/lib/Job.ts

@@ -26,6 +26,6 @@ describe('Queue functions', () => {
 
   it('getCancelQueue returns correct queue name', () => {
     const result = getCancellationsQueue();
-    expect(result).toEqual(`job_cancellations`);
+    expect(result).toEqual(`job_deletions`);
   });
 });

sdk/src/lib/queue.spec.ts

@@ -17,5 +17,5 @@ export function getStatusQueue(job: Job) {
 }
 
 export function getCancellationsQueue() {
-  return `job_cancellations`;
+  return `job_deletions`;
 }