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

chore: release #98

Merged
merged 2 commits into from
Aug 16, 2024
Merged

chore: release #98

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
217211b
fix(meta): surrpess empty entires
Aug 2, 2024
f99be6a
fix(hotfix): workaround the not set ResourceAPI.logger, bypass bugs i…
Aug 16, 2024
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
2 changes: 1 addition & 1 deletion cfg/config_test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"logger": {
"console": {
"handleExceptions": false,
"level": "crit",
"level": "error",
"colorize": true,
"prettyPrint": true
}
Expand Down
212 changes: 157 additions & 55 deletions src/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import nconf from 'nconf';
import { Logger } from 'winston';
import * as uuid from 'uuid';
import { Logger } from '@restorecommerce/logger';
import { ServiceConfig } from '@restorecommerce/service-config';
import {
database
} from '@restorecommerce/chassis-srv';
Expand All @@ -15,7 +16,7 @@ import {
DefaultACSClientContextFactory,
Operation,
DefaultResourceFactory,
DefaultMetaDataInjector,
// DefaultMetaDataInjector,
access_controlled_function,
access_controlled_service,
injects_meta_data,
Expand All @@ -29,7 +30,6 @@ import { Topic } from '@restorecommerce/kafka-client';
import {
OrderList,
OrderResponse,
DeepPartial,
FulfillmentRequestList,
Order,
OrderState,
Expand All @@ -39,6 +39,8 @@ import {
OrderingInvoiceRequestList,
FulfillmentInvoiceMode,
OrderSubmitListResponse,
FulfillmentRequest,
OrderingInvoiceRequest,
} from '@restorecommerce/rc-grpc-clients/dist/generated-server/io/restorecommerce/order.js';
import {
PhysicalProduct,
Expand Down Expand Up @@ -125,8 +127,10 @@ export const DefaultSubjectResolver = async <T extends ResourceList>(
request: T,
...args: any
): Promise<T> => {
const subject = request.subject;
subject.id = undefined;
const subject = request?.subject;
if (subject?.id) {
delete subject.id;
}
if (subject?.token) {
const user = await self.__userService.findByToken({ token: subject.token });
if (user?.payload?.id) {
Expand All @@ -136,6 +140,73 @@ export const DefaultSubjectResolver = async <T extends ResourceList>(
return request;
};

export const DefaultMetaDataInjector = async <T extends ResourceList>(
self: OrderingService,
request: T,
...args: any
): Promise<T> => {
const urns = self.cfg.get('authorization:urns');
const ids = [...new Set(
request.items?.map(
(item) => item.id
).filter(
id => id
)
)
];
const meta_map = await self.read({
filters: [{
filters: [{
field: 'id',
operation: Filter_Operation.in,
value: JSON.stringify(ids),
type: Filter_ValueType.ARRAY,
filters: [],
}]
}],
limit: ids.length,
subject: request.subject
}).then(
(response: OrderListResponse) => new Map(response.items?.filter(
item => item.payload
).map(
item => [item.payload.id, item.payload.meta]
))
);

request.items?.forEach((item) => {
if (!item.id?.length) {
item.id = uuid.v4().replace(/-/g, '');
}

if (!item.meta?.owners?.length) {
item.meta = {
...meta_map.get(item.id),
...item.meta,
owners: [
request.subject?.scope ? {
id: urns.ownerIndicatoryEntity,
value: urns.organization, // to be passed here to change
attributes: [{
id: urns.ownerInstance,
value: request.subject.scope
}],
} : undefined,
request.subject?.id ? {
id: urns.ownerIndicatoryEntity,
value: urns.user,
attributes: [{
id: urns.ownerInstance,
value: request.subject.id
}],
} : undefined,
].filter(i => !!i)
};
}
});
return request;
};

export type OrderMap = { [key: string]: OrderResponse };
export type ProductMap = { [key: string]: ProductResponse };
export type FulfillmentMap = { [key: string]: FulfillmentResponse[] };
Expand Down Expand Up @@ -177,7 +248,9 @@ export class OrderingService
request: OrderList & OrderIdList & FulfillmentRequestList & OrderingInvoiceRequestList,
context: any,
): Promise<ACSClientContext> {
const ids = request.ids ?? request.items?.map(item => item.id!) ?? [] as string[];
const ids = request.ids ?? request.items?.map(
(item: Order & FulfillmentRequest & OrderingInvoiceRequest) => item.id ?? item.order_id
) ?? [] as string[];
const resources = await self.getOrdersById(ids, request?.subject!, context);
return {
...context,
Expand Down Expand Up @@ -252,7 +325,7 @@ export class OrderingService
NO_ITEM: {
id: '',
code: 400,
message: '{entity} {id} has no item in cart',
message: '{entity} {id} has no item in query',
},
NO_PHYSICAL_ITEM: {
id: '',
Expand Down Expand Up @@ -285,7 +358,7 @@ export class OrderingService
},
NO_ITEM: {
code: 400,
message: 'No item in cart!',
message: 'No item in query!',
},
ITEM_NOT_FOUND: {
code: 404,
Expand Down Expand Up @@ -342,7 +415,7 @@ export class OrderingService
constructor(
protected readonly topic: Topic,
protected readonly db: database.DatabaseProvider,
protected readonly cfg: nconf.Provider,
public readonly cfg: ServiceConfig,
logger: Logger,
) {
super(
Expand All @@ -359,6 +432,7 @@ export class OrderingService
),
!!cfg.get('events:enableEvents')
);
this.resourceapi.logger = logger;

this.urns = {
...this.urns,
Expand Down Expand Up @@ -557,16 +631,25 @@ export class OrderingService
message: e?.message ?? e?.details ?? (e ? JSON.stringify(e) : 'Unknown Error!'),
}
};
this.logger.error(error);
this.logger?.error(error);
return error;
}

private getOrdersById(
private async getOrdersById(
ids: (string | undefined)[] | undefined,
subject?: Subject,
context?: any
): Promise<OrderListResponse> {
const order_ids = [...new Set(ids)];
const order_ids = [...new Set(ids)].filter(
ids => ids
);

if (order_ids.length === 0) {
throw this.createOperationStatusCode(
this.operation_status_codes.NO_ITEM,
this.name,
);
}

if (order_ids.length > 1000) {
throw this.createOperationStatusCode(
Expand All @@ -579,18 +662,17 @@ export class OrderingService
{
filters: [{
filters: [{
field: 'id',
field: '_key',
operation: Filter_Operation.in,
value: JSON.stringify(order_ids),
type: Filter_ValueType.ARRAY,
filters: [],
}]
}],
limit: order_ids.length,
subject,
}
);
return super.read(call, context);
return await super.read(call, context);
}

private getOrderMap(
Expand Down Expand Up @@ -1361,29 +1443,35 @@ export class OrderingService
)
);

order.meta.owners = [
...order.meta?.owners,
!has_shop_as_owner && {
id: this.urns.ownerIndicatoryEntity,
value: this.urns.organization,
attributes: [
{
id: this.urns.ownerInstance,
value: shop.payload.organization_id
}
]
},
!has_customer_as_owner && {
id: this.urns.ownerIndicatoryEntity,
value: customer_entity,
attributes: [
{
id: this.urns.ownerInstance,
value: customer_instance
}
]
}
];
if (!has_shop_as_owner ) {
order.meta.owners.push(
{
id: this.urns.ownerIndicatoryEntity,
value: this.urns.organization,
attributes: [
{
id: this.urns.ownerInstance,
value: shop.payload.organization_id
}
]
}
);
}

if (!has_customer_as_owner ) {
order.meta.owners.push(
{
id: this.urns.ownerIndicatoryEntity,
value: customer_entity,
attributes: [
{
id: this.urns.ownerInstance,
value: customer_instance
}
]
}
);
};

return {
payload: order,
Expand Down Expand Up @@ -1505,7 +1593,9 @@ export class OrderingService
@resolves_subject(
DefaultSubjectResolver
)
@injects_meta_data()
@injects_meta_data(
DefaultMetaDataInjector
)
@access_controlled_function({
action: AuthZAction.CREATE,
operation: Operation.isAllowed,
Expand All @@ -1531,6 +1621,9 @@ export class OrderingService
@resolves_subject(
DefaultSubjectResolver
)
@injects_meta_data(
DefaultMetaDataInjector
)
@access_controlled_function({
action: AuthZAction.MODIFY,
operation: Operation.isAllowed,
Expand All @@ -1549,7 +1642,9 @@ export class OrderingService
@resolves_subject(
DefaultSubjectResolver
)
@injects_meta_data()
@injects_meta_data(
DefaultMetaDataInjector
)
@access_controlled_function({
action: AuthZAction.MODIFY,
operation: Operation.isAllowed,
Expand All @@ -1562,20 +1657,15 @@ export class OrderingService
request: OrderList,
context?: any
) {
request?.items?.forEach(
item => {
if (!item.order_state || item.order_state === OrderState.UNRECOGNIZED) {
item.order_state = OrderState.PENDING;
}
}
);
return super.upsert(request, context);
}

@resolves_subject(
DefaultSubjectResolver
)
@injects_meta_data()
@injects_meta_data(
DefaultMetaDataInjector
)
@access_controlled_function({
action: AuthZAction.EXECUTE,
operation: Operation.isAllowed,
Expand All @@ -1600,10 +1690,6 @@ export class OrderingService
}
}

@resolves_subject(
DefaultSubjectResolver
)
@injects_meta_data()
@access_controlled_function({
action: AuthZAction.EXECUTE,
operation: Operation.isAllowed,
Expand All @@ -1612,6 +1698,22 @@ export class OrderingService
database: 'arangoDB',
useCache: true,
})
private upsertSubmit(
request: OrderList,
context?: any
): Promise<OrderListResponse> {
return super.upsert(
request,
context,
);
}

@resolves_subject(
DefaultSubjectResolver
)
@injects_meta_data(
DefaultMetaDataInjector
)
public async submit(
request: OrderList,
context?: any
Expand Down Expand Up @@ -1690,14 +1792,14 @@ export class OrderingService
};
}

const orders = await super.upsert(
const orders = await this.upsertSubmit(
{
items,
total_count: items.length,
subject: request.subject,
},
context,
) as OrderListResponse;
);

orders.items?.forEach(
item => {
Expand Down
Loading
Loading