Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor job event handler #19

Merged
merged 2 commits into from
Mar 5, 2023
Merged

Refactor job event handler #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88ea60a
Refactor job event handler
k2tzumi Mar 5, 2023
9954b7b
Fixing `Missing return type on function`
k2tzumi Mar 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 7 additions & 19 deletions __tests__/DelayedJobBroker.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { DelayedJobBroker } from "../src/DelayedJobBroker";
import { Parameter } from "../src/JobBroker";
import { Parameter, TimeBasedEvent } from "../src/JobBroker";

const scriptCache = {
get: jest.fn(function () {
Expand Down Expand Up @@ -49,15 +49,19 @@ ScriptApp['deleteTrigger'] = jest.fn();
ScriptApp['TriggerSource'] = jest.fn(() => triggerSource);
LockService['getScriptLock'] = jest.fn(() => lock);

const jobEventHandler = (event :TimeBasedEvent): void => {
console.log(JSON.stringify(event));
}

describe('DelayedJobBroker', () => {
describe('createJob', () => {
it('success', () => {
const broker = DelayedJobBroker.createJob<Parameter>(new Date());
const broker = DelayedJobBroker.createJob<Parameter>(jobEventHandler, new Date());
});
});
describe('performLater', () => {
it('success', () => {
const broker = DelayedJobBroker.createJob<Parameter>(new Date());
const broker = DelayedJobBroker.createJob<Parameter>(jobEventHandler, new Date());

interface HOGE {
foo: string;
Expand All @@ -76,21 +80,5 @@ describe('DelayedJobBroker', () => {
broker.performLater(jest.fn(), hoge);
});
});
describe('perform', () => {
it('success', () => {
const broker = DelayedJobBroker.createJob<Parameter>(new Date());

const callBack = (): boolean => { return true; };

DelayedJobBroker.perform(callBack, "callBack");
});
it('failed', () => {
const broker = DelayedJobBroker.createJob<Parameter>(new Date());

const callBack = (): boolean => { return true; };

DelayedJobBroker.perform(callBack, "callBack");
});
});
});

37 changes: 10 additions & 27 deletions __tests__/JobBroker.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { JobBroker, JobFunction, Parameter } from "../src/JobBroker";
import { JobBroker, JobFunction, Parameter, TimeBasedEvent } from "../src/JobBroker";

const scriptCache = {
get: jest.fn(function () {
Expand Down Expand Up @@ -47,10 +47,14 @@ ScriptApp['deleteTrigger'] = jest.fn();
ScriptApp['TriggerSource'] = jest.fn(() => triggerSource);
LockService['getScriptLock'] = jest.fn(() => lock);

const jobEventHandler = (event :TimeBasedEvent): void => {
console.log(JSON.stringify(event));
}

describe('JobBroker', () => {
describe('enqueue', () => {
it('success', () => {
const jobBroker = new JobBroker<Parameter>();
const jobBroker = new JobBroker<Parameter>(jobEventHandler);
interface HOGE {
foo: string;
}
Expand All @@ -68,35 +72,14 @@ describe('JobBroker', () => {
jobBroker.enqueue(jest.fn(), hoge);
});
});
describe('dequeue', () => {
describe('consumeJob', () => {
it('success', () => {
const jobBroker = new JobBroker<Parameter>();
const jobBroker = new JobBroker<Parameter>(jobEventHandler);

jobBroker.enqueue(jest.fn(), {});
jobBroker.dequeue('dummy');
const event = {} as TimeBasedEvent;
jobBroker.consumeJob(event);
});
});
describe('consumeJob', () => {
it('success', () => {
type paramType = { foo: string; };
const jobBroker = new JobBroker<paramType>();
const param : paramType = { foo: "bar" };
const callBack: JobFunction<paramType> = (parameter): boolean => {
console.log(param.foo);
return true;
};
jobBroker.consumeJob(callBack, "callBack");
});
it('failed', () => {
type paramType = { foo: string; };
const jobBroker = new JobBroker<paramType>();
const param : paramType = { foo: "bar" };
const callBack: JobFunction<paramType> = (parameter): boolean => {
console.log(param.foo);
return false;
};
jobBroker.consumeJob(callBack, "callBack");
});
});
});

23 changes: 9 additions & 14 deletions src/DelayedJobBroker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,30 @@ import {
Job,
JobParameter,
Parameter,
TimeBasedEvent,
} from "./JobBroker";

class DelayedJobBroker<T extends Parameter> extends JobBroker<T> {
private constructor(private scheduled_at: Date) {
super();
private constructor(
eventHandler: (event: TimeBasedEvent) => void,
private scheduled_at: Date
) {
super(eventHandler);
}

static createJob<T extends Parameter>(
eventHandler: (event: TimeBasedEvent) => void,
scheduled_at: Date
): DelayedJobBroker<T> {
return new this(scheduled_at);
return new this(eventHandler, scheduled_at);
}

public performLater(callback: JobFunction<T>, parameter: Parameter): void {
this.enqueue(callback, parameter);
}

static perform<T extends Parameter>(
closure: JobFunction<T>,
handler?: string
): void {
new this(new Date()).consumeJob(
closure,
handler ? handler : this.perform.caller.name
);
}

protected createJob(callback: JobFunction<T>, parameter: Parameter): Job {
const trigger = ScriptApp.newTrigger(callback.name)
const trigger = ScriptApp.newTrigger(this.eventHandler.name)
.timeBased()
.at(this.scheduled_at)
.create();
Expand Down
Loading