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.

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

feat: ✨ support batch order's API urls #13

Merged
merged 4 commits into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
18 changes: 16 additions & 2 deletions src/models/Order.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,14 @@ export class Order {
: undefined;
}

public get csvOrderId(): string | null {
return this._data.csvOrderId;
}

public get batchId(): string | undefined {
return this._data.batchId;
}

/**
* Get the template of the order
* @throws { PrintOneError } If the template could not be fetched.
Expand All @@ -125,7 +133,9 @@ export class Order {
* @throws { PrintOneError } If the order could not be refreshed.
*/
public async refresh(): Promise<void> {
this._data = await this._protected.client.GET<IOrder>(`orders/${this.id}`);
this._data = await this._protected.client.GET<IOrder>(
`${this.urlPrefix}orders/${this.id}`,
);
}

/**
Expand Down Expand Up @@ -169,8 +179,12 @@ export class Order {
}

this._data = await this._protected.client.POST<IOrder>(
`orders/${this.id}/cancel`,
`${this.urlPrefix}orders/${this.id}/cancel`,
{},
);
}

protected get urlPrefix(): string {
return this.batchId ? `batches/${this.batchId}/` : "";;
}
}
2 changes: 2 additions & 0 deletions src/models/_interfaces/IOrder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ export type IOrder = {
createdAt: string;
updatedAt: string;
anonymizedAt: string | null;
csvOrderId: string | null;
batchId?: string;
};
1 change: 1 addition & 0 deletions test/Batch.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ describe("getOrder", function () {
expect(result).toBeDefined();
expect(result).toBeInstanceOf(Order);
expect(result.id).toEqual(order.id);
expect(result.batchId).toEqual(batch.id);
});

it("should not return an non batch order", async function () {
Expand Down
6 changes: 6 additions & 0 deletions test/PrintOne.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,12 @@ describe("getOrder", function () {
expect(order.isBillable).toEqual(expect.any(Boolean));
expect(order.errors).toEqual(expect.any(Array));
expect(order.definitiveCountryId).toEqual(expect.any(String));
expect(order.csvOrderId).toEqual(
expect.toBeOneOf([expect.any(String), null]),
);
expect(order.batchId).toEqual(
expect.toBeOneOf([expect.any(String), undefined]),
);
});

it("should throw an error when the order does not exist", async function () {
Expand Down
Loading