Skip to content

chore: release #130

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

Merged
github-actions merged 1 commit into from
Sep 2, 2025
Merged

chore: release #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 21 additions & 1 deletion cfg/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,12 @@
"renderResponse": {
"messageObject": "io.restorecommerce.rendering.RenderResponseList"
},
"fulfillmentModified": {
"messageObject": "io.restorecommerce.fulfillment.Fulfillment"
},
"invoiceModified": {
"messageObject": "io.restorecommerce.invoice.Invoice"
},
"sendEmail": {
"messageObject": "io.restorecommerce.notification_req.NotificationReq"
},
Expand Down Expand Up @@ -202,6 +208,18 @@
"withdrawOrders": "handleWithdrawOrders",
"cancelOrders": "handleCancelOrders"
}
},
"fulfillment.resource": {
"topic": "io.restorecommerce.fulfillment.resource",
"events": {
"fulfillmentModified": "handleStateUpdate"
}
},
"invoicing.resource": {
"topic": "io.restorecommerce.invoicing.resource",
"events": {
"invoiceModified": "handleStateUpdate"
}
}
}
}
Expand Down Expand Up @@ -311,7 +329,9 @@
"health": "grpc-health-v1"
},
"urns": {
"instanceType": "urn:restorecommerce:acs:model:order:Order",
"order": "urn:restorecommerce:acs:model:order:Order",
"fulfillment": "urn:restorecommerce:acs:model:fulfillment:Fulfillment",
"invoice": "urn:restorecommerce:acs:model:invoice:Invoice",
"shop_fulfillment_create_enabled": "urn:restorecommerce:shop:setting:order:submit:fulfillment:create:enabled",
"shop_invoice_create_enabled": "urn:restorecommerce:shop:setting:order:submit:invoice:create:enabled",
"shop_invoice_render_enabled": "urn:restorecommerce:shop:setting:order:submit:invoice:render:enabled",
Expand Down
147 changes: 114 additions & 33 deletions src/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ import {
FulfillmentListResponse,
FulfillmentResponse,
Packaging,
Fulfillment,
FulfillmentState,
} from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/fulfillment.js';
import {
FulfillmentProductServiceDefinition,
Expand All @@ -78,6 +80,7 @@ import {
} from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/filter.js';
import {
Filter_ValueType,
FilterOp_Operator,
} from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/resource_base.js';
import {
StatusListResponse
Expand All @@ -88,7 +91,9 @@ import {
Section,
Position,
InvoiceServiceDefinition,
InvoiceList
InvoiceList,
Invoice,
PaymentState
} from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/invoice.js';
import {
Subject
Expand Down Expand Up @@ -325,9 +330,11 @@ export class OrderingService
return this.name;
}

/*
get instance_type() {
return this.urns.instanceType;
return this.urns.order;
}
*/

constructor(
protected readonly orderingTopic: Topic,
Expand Down Expand Up @@ -901,21 +908,13 @@ export class OrderingService
fulfillments ??= await this.fulfillment_service!.read(
{
filters: [{
filters: [
{
field: 'references[*].instance_type',
operation: Filter_Operation.in,
value: this.instance_type,
},
{
field: 'references[*].instance_id',
operation: Filter_Operation.in,
value: JSON.stringify(order_ids),
type: Filter_ValueType.ARRAY
}
]
filters: order_ids?.map(id => ({
field: 'references[*].instance_id',
operation: Filter_Operation.in,
value: id,
})),
operator: FilterOp_Operator.or,
}],
limit: order_ids.length,
subject,
},
context,
Expand All @@ -930,10 +929,10 @@ export class OrderingService
}
);

return fulfillments.reduce(
return fulfillments?.reduce(
(a, b) => {
b.payload?.references.filter(
r => r.instance_type === this.instance_type
r => r.instance_type === this.urns.order
).forEach(
r => {
const c = a[r.instance_id];
Expand Down Expand Up @@ -1673,7 +1672,9 @@ export class OrderingService
r => {
r.items?.forEach(
fulfillment => {
const id = fulfillment.payload?.references?.[0]?.instance_id ?? fulfillment.status?.id;
const id = fulfillment.payload?.references?.find(
r => r.instance_type === this.urns.order
)?.instance_id ?? fulfillment.status?.id;
const order = response_map[id];
if (order && fulfillment.status?.code >= 300) {
order.status = createStatusCode(
Expand Down Expand Up @@ -1727,7 +1728,9 @@ export class OrderingService
r => {
r.items?.forEach(
fulfillment => {
const id = fulfillment.payload?.references?.[0]?.instance_id ?? fulfillment.status?.id;
const id = fulfillment.payload?.references?.find(
r => r.instance_type === this.urns.order
)?.instance_id ?? fulfillment.status?.id;
const order = response_map[id];
if (order && fulfillment.status?.code >= 300) {
order.status = createStatusCode(
Expand Down Expand Up @@ -1797,7 +1800,9 @@ export class OrderingService
response.invoices.push(...r.items);
r.items.forEach(
item => {
const id = item.payload?.references?.[0]?.instance_id;
const id = item.payload?.references?.find(
r => r.instance_type === this.urns.order
)?.instance_id;
const order = response_map[id];
if (order && item.status?.code >= 300) {
order.status = createStatusCode(
Expand Down Expand Up @@ -1863,7 +1868,9 @@ export class OrderingService
response.invoices.push(...r.items);
r.items.forEach(
item => {
const id = item.payload?.references?.[0]?.instance_id;
const id = item.payload?.references?.find(
r => r.instance_type === this.urns.order
)?.instance_id;
const order = response_map[id];
if (order && item.status?.code >= 300) {
order.status = createStatusCode(
Expand Down Expand Up @@ -1898,9 +1905,13 @@ export class OrderingService
this.logger?.debug('Send invoices on submit...');
const invoices = response.invoices?.filter(
item => {
const setting = settings.get(item.payload?.references?.[0]?.instance_id);
const setting = settings.get(item.payload?.references?.find(
r => r.instance_type === this.urns.order
)?.instance_id);
return item.status?.code < 300
&& item.payload?.references?.[0]?.instance_id
&& item.payload?.references?.find(
r => r.instance_type === this.urns.order
)?.instance_id
&& !setting?.shop_invoice_send_disabled;
}
).map(
Expand Down Expand Up @@ -2113,7 +2124,7 @@ export class OrderingService
(a, b) => {
a[b.order_id] = {
reference: {
instance_type: this.instance_type,
instance_type: this.urns.order,
instance_id: b.order_id,
}
};
Expand Down Expand Up @@ -2182,7 +2193,7 @@ export class OrderingService

const query: FulfillmentSolutionQuery = {
reference: {
instance_type: this.instance_type,
instance_type: this.urns.order,
instance_id: order.payload.id,
},
recipient: order.payload?.shipping_address,
Expand Down Expand Up @@ -2301,7 +2312,7 @@ export class OrderingService
customer_id: order.payload.customer_id,
user_id: order.payload.user_id,
references: [{
instance_type: this.instance_type,
instance_type: this.urns.order,
instance_id: item.order_id,
}],
packaging: {
Expand Down Expand Up @@ -2750,12 +2761,25 @@ export class OrderingService
user_id: master.payload.user_id,
customer_id: master.payload.customer_id,
shop_id: master.payload.shop_id,
references: invoice.sections.map(
section => ({
instance_type: this.instance_type,
instance_id: section.order_id,
})
),
references: invoice.sections?.flatMap(
section => [
[{
instance_type: this.urns.order,
instance_id: section.order_id,
}],
section.selected_fulfillments?.map(
f => ({
instance_type: this.urns.fulfillment,
instance_id: f.fulfillment_id,
})
) ?? fulfillment_map[section.order_id]?.map(
f => ({
instance_type: this.urns.fulfillment,
instance_id: f.payload?.id,
})
),
]
)?.flat().filter(Boolean),
customer_remark: master.payload.customer_remark,
customer_order_number: master.payload.customer_order_nr,
customer_vat_id: master.payload.customer_vat_id,
Expand Down Expand Up @@ -3190,4 +3214,61 @@ export class OrderingService
);
return status?.operation_status;
}

public async checkCompletion(
msg: Invoice | Fulfillment
) {
const ids = msg.references.filter(
ref => ref.instance_type === this.urns.order
).map(
ref => ref.instance_id
);

const fulfillments_complete = await this.getFulfillmentMap(
ids,
this.tech_user,
).then(
fm => Object.values(fm).flat().every(
f => f.payload?.fulfillment_state === FulfillmentState.COMPLETE
)
);

const invoices_payed = await this.invoice_service?.read(
{
filters: [{
filters: ids?.map(id => ({
field: 'references[*].instance_id',
operation: Filter_Operation.in,
value: id,
})),
operator: FilterOp_Operator.or,
}],
subject: this.tech_user,
},
).then(
response => {
if (response.operation_status?.code < 300) {
return response.items;
}
else {
throw response.operation_status;
}
}
).then(
invoices => invoices.every(
i => i.payload?.payment_state === PaymentState.PAYED
)
);

if (fulfillments_complete && invoices_payed) {
await this.superUpdate({
items: ids.map(id => ({
id,
order_state: OrderState.COMPLETED
})),
subject: this.tech_user,
total_count: ids.length,
});
}
}
}
4 changes: 3 additions & 1 deletion src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,9 @@ export const toObjectListMap = <T extends Entity>(items: T[]): Record<string, T[
) ?? {};

export const DefaultUrns = {
instanceType: 'urn:restorecommerce:acs:model:order:Order',
order: 'urn:restorecommerce:acs:model:order:Order',
fulfillment: 'urn:restorecommerce:acs:model:fulfillment:Fulfillment',
invoice: 'urn:restorecommerce:acs:model:invoice:Invoice',
ownerIndicatoryEntity: 'urn:restorecommerce:acs:names:ownerIndicatoryEntity',
ownerInstance: 'urn:restorecommerce:acs:names:ownerInstance',
organization: 'urn:restorecommerce:acs:model:organization.Organization',
Expand Down
Loading
Loading