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

Rewrite big UI methods into one API in Orders APP #3610

Merged
merged 26 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b5b5f56
Fix extended tests Thunderjet
bohdanihor Apr 16, 2024
9168dee
Merge branch 'master' of https://github.com/folio-org/stripes-testing
bohdanihor Apr 16, 2024
a4e661c
Merge branch 'master' of https://github.com/folio-org/stripes-testing
bohdanihor Apr 18, 2024
9407007
Merge branch 'master' of https://github.com/folio-org/stripes-testing
bohdanihor Apr 19, 2024
9b4ae2d
Merge branch 'master' of https://github.com/folio-org/stripes-testing
bohdanihor Apr 21, 2024
f06d8f4
Merge branch 'master' of https://github.com/folio-org/stripes-testing
bohdanihor Apr 23, 2024
bc7fc6f
Merge branch 'master' of https://github.com/folio-org/stripes-testing
bohdanihor Apr 24, 2024
aa3ee21
Merge branch 'master' of https://github.com/folio-org/stripes-testing
bohdanihor Apr 24, 2024
0a83653
Merge branch 'master' of https://github.com/folio-org/stripes-testing
bohdanihor Apr 25, 2024
f6c7f3c
Merge branch 'master' of https://github.com/folio-org/stripes-testing
bohdanihor Apr 29, 2024
e9f23bb
Rewrite big UI methods into one API
bohdanihor May 1, 2024
0b27fe6
Merge branch 'master' of https://github.com/folio-org/stripes-testing
bohdanihor May 1, 2024
93c5787
Rewrite big UI methods into one API in Orders APP
bohdanihor May 14, 2024
417a7a5
message
bohdanihor May 14, 2024
3f62ad9
Merge branch 'master' of https://github.com/folio-org/stripes-testing…
bohdanihor May 15, 2024
9b0010c
Add master
bohdanihor May 15, 2024
4d22eba
Replace methods
bohdanihor May 16, 2024
d9d48bd
Remove methods
bohdanihor May 16, 2024
3914a78
Add one
bohdanihor May 16, 2024
208560f
Add in new cases
bohdanihor May 17, 2024
bf49365
message
bohdanihor May 17, 2024
58ec09b
Add tests
bohdanihor May 20, 2024
b4c37f6
Merge branch 'master' into FAT-13414
IhorBohdan May 21, 2024
785ee39
Merge branch 'master' into FAT-13414
IhorBohdan May 21, 2024
9818c12
Merge branch 'master' into FAT-13414
IhorBohdan May 22, 2024
99662cc
Merge branch 'master' into FAT-13414
IhorBohdan May 22, 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
3 changes: 2 additions & 1 deletion cypress/e2e/finance/funds/filter-transer-from-in-fund.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import getRandomPostfix from '../../../support/utils/stringTools';
import Budgets from '../../../support/fragments/finance/budgets/budgets';

describe('ui-finance: Funds', () => {
const defaultFiscalYear = { ...FiscalYears.defaultRolloverFiscalYear };
const defaultFiscalYear = { ...FiscalYears.defaultUiFiscalYear };
const defaultLedger = { ...Ledgers.defaultUiLedger };
const firstFund = { ...Funds.defaultUiFund };
const secondFund = {
Expand Down Expand Up @@ -43,6 +43,7 @@ describe('ui-finance: Funds', () => {
Ledgers.createViaApi(defaultLedger).then((ledgerResponse) => {
defaultLedger.id = ledgerResponse.id;
firstFund.ledgerId = defaultLedger.id;
secondFund.ledgerId = defaultLedger.id;

Funds.createViaApi(firstFund).then((fundResponse) => {
firstFund.id = fundResponse.fund.id;
Expand Down
102 changes: 67 additions & 35 deletions cypress/e2e/orders/add-cancel-po-and-display-indication.cy.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import permissions from '../../support/dictionary/permissions';
import FinanceHelp from '../../support/fragments/finance/financeHelper';
import FiscalYears from '../../support/fragments/finance/fiscalYears/fiscalYears';
import Funds from '../../support/fragments/finance/funds/funds';
import Ledgers from '../../support/fragments/finance/ledgers/ledgers';
Expand All @@ -12,9 +11,13 @@ import NewLocation from '../../support/fragments/settings/tenant/locations/newLo
import ServicePoints from '../../support/fragments/settings/tenant/servicePoints/servicePoints';
import TopMenu from '../../support/fragments/topMenu';
import Users from '../../support/fragments/users/users';
import Budgets from '../../support/fragments/finance/budgets/budgets';
import { ACQUISITION_METHOD_NAMES_IN_PROFILE, ORDER_STATUSES } from '../../support/constants';
import BasicOrderLine from '../../support/fragments/orders/basicOrderLine';
import MaterialTypes from '../../support/fragments/settings/inventory/materialTypes';

describe('ui-finance: Fiscal Year Rollover', () => {
const firstFiscalYear = { ...FiscalYears.defaultRolloverFiscalYear };
const firstFiscalYear = { ...FiscalYears.defaultUiFiscalYear };
const defaultLedger = { ...Ledgers.defaultUiLedger };
const defaultFund = { ...Funds.defaultUiFund };
const defaultOrder = {
Expand All @@ -25,7 +28,10 @@ describe('ui-finance: Fiscal Year Rollover', () => {
reEncumber: true,
};
const organization = { ...NewOrganization.defaultUiOrganizations };
const allocatedQuantity = '100';
const firstBudget = {
...Budgets.getDefaultBudget(),
allocated: 100,
};
let user;
let orderNumber;
let servicePointId;
Expand All @@ -35,49 +41,75 @@ describe('ui-finance: Fiscal Year Rollover', () => {
cy.getAdminToken();
FiscalYears.createViaApi(firstFiscalYear).then((firstFiscalYearResponse) => {
firstFiscalYear.id = firstFiscalYearResponse.id;
firstBudget.fiscalYearId = firstFiscalYearResponse.id;
defaultLedger.fiscalYearOneId = firstFiscalYear.id;
Ledgers.createViaApi(defaultLedger).then((ledgerResponse) => {
defaultLedger.id = ledgerResponse.id;
defaultFund.ledgerId = defaultLedger.id;

Funds.createViaApi(defaultFund).then((fundResponse) => {
defaultFund.id = fundResponse.fund.id;
firstBudget.fundId = fundResponse.fund.id;
Budgets.createViaApi(firstBudget);
ServicePoints.getViaApi().then((servicePoint) => {
servicePointId = servicePoint[0].id;
NewLocation.createViaApi(NewLocation.getDefaultLocation(servicePointId)).then((res) => {
location = res;

cy.loginAsAdmin({ path: TopMenu.fundPath, waiter: Funds.waitLoading });
FinanceHelp.searchByName(defaultFund.name);
Funds.selectFund(defaultFund.name);
Funds.addBudget(allocatedQuantity);
MaterialTypes.createMaterialTypeViaApi(MaterialTypes.getDefaultMaterialType()).then(
(mtypes) => {
cy.getAcquisitionMethodsApi({
query: `value="${ACQUISITION_METHOD_NAMES_IN_PROFILE.PURCHASE_AT_VENDOR_SYSTEM}"`,
}).then((params) => {
// Prepare 2 Open Orders for Rollover
Organizations.createOrganizationViaApi(organization).then(
(responseOrganizations) => {
organization.id = responseOrganizations;
defaultOrder.vendor = organization.id;
const firstOrderLine = {
...BasicOrderLine.defaultOrderLine,
cost: {
listUnitPrice: 40.0,
currency: 'USD',
discountType: 'percentage',
quantityPhysical: 1,
poLineEstimatedPrice: 40.0,
},
fundDistribution: [
{ code: defaultFund.code, fundId: defaultFund.id, value: 100 },
],
locations: [
{ locationId: location.id, quantity: 1, quantityPhysical: 1 },
],
acquisitionMethod: params.body.acquisitionMethods[0].id,
physical: {
createInventory: 'Instance, Holding, Item',
materialType: mtypes.body.id,
materialSupplier: responseOrganizations,
volumes: [],
},
};
Orders.createOrderViaApi(defaultOrder).then((firstOrderResponse) => {
defaultOrder.id = firstOrderResponse.id;
firstOrderLine.purchaseOrderId = firstOrderResponse.id;
orderNumber = firstOrderResponse.poNumber;
defaultOrder.poNumber = firstOrderResponse.poNumber;
OrderLines.createOrderLineViaApi(firstOrderLine);
Orders.updateOrderViaApi({
...firstOrderResponse,
workflowStatus: ORDER_STATUSES.OPEN,
});
});
},
);
});
},
);
});
});
});
});
});
ServicePoints.getViaApi().then((servicePoint) => {
servicePointId = servicePoint[0].id;
NewLocation.createViaApi(NewLocation.getDefaultLocation(servicePointId)).then((res) => {
location = res;
});
});

Organizations.createOrganizationViaApi(organization).then((responseOrganizations) => {
organization.id = responseOrganizations;
});
defaultOrder.vendor = organization.name;
cy.visit(TopMenu.ordersPath);
Orders.createApprovedOrderForRollover(defaultOrder, true).then((firstOrderResponse) => {
defaultOrder.id = firstOrderResponse.id;
orderNumber = firstOrderResponse.poNumber;
Orders.checkCreatedOrder(defaultOrder);
OrderLines.addPOLine();
OrderLines.selectRandomInstanceInTitleLookUP('*', 25);
OrderLines.rolloverPOLineInfoforPhysicalMaterialWithFund(
defaultFund,
'40',
'1',
'40',
location.name,
);
OrderLines.backToEditingOrder();
Orders.openOrder();
});
cy.createTempUser([
permissions.uiOrdersEdit.gui,
permissions.uiOrdersCancelOrderLines.gui,
Expand Down
71 changes: 29 additions & 42 deletions cypress/e2e/orders/adding-donor-information-to-new-pol.cy.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import permissions from '../../support/dictionary/permissions';
import FinanceHelp from '../../support/fragments/finance/financeHelper';
import FiscalYears from '../../support/fragments/finance/fiscalYears/fiscalYears';
import Funds from '../../support/fragments/finance/funds/funds';
import Ledgers from '../../support/fragments/finance/ledgers/ledgers';
Expand All @@ -12,7 +11,7 @@ import NewLocation from '../../support/fragments/settings/tenant/locations/newLo
import ServicePoints from '../../support/fragments/settings/tenant/servicePoints/servicePoints';
import TopMenu from '../../support/fragments/topMenu';
import Users from '../../support/fragments/users/users';
import getRandomPostfix from '../../support/utils/stringTools';
import Budgets from '../../support/fragments/finance/budgets/budgets';

describe('Orders', () => {
const firstFiscalYear = { ...FiscalYears.defaultRolloverFiscalYear };
Expand All @@ -30,15 +29,11 @@ describe('Orders', () => {
isDonor: true,
isVendor: true,
};
const secondOrganization = {
name: `autotest_name_${getRandomPostfix()}`,
status: 'Active',
code: `autotest_code_${getRandomPostfix()}`,
isDonor: true,
isVendor: false,
erpCode: `ERP-${getRandomPostfix()}`,

const firstBudget = {
...Budgets.getDefaultBudget(),
allocated: 100,
};
const allocatedQuantity = '100';
let user;
let orderNumber;
let servicePointId;
Expand All @@ -48,44 +43,36 @@ describe('Orders', () => {
cy.getAdminToken();
Organizations.createOrganizationViaApi(firstOrganization).then((responseFirstOrganization) => {
firstOrganization.id = responseFirstOrganization;
Organizations.createOrganizationViaApi(secondOrganization).then(
(responseSecondOrganization) => {
secondOrganization.id = responseSecondOrganization;
FiscalYears.createViaApi(firstFiscalYear).then((firstFiscalYearResponse) => {
firstFiscalYear.id = firstFiscalYearResponse.id;
defaultLedger.fiscalYearOneId = firstFiscalYear.id;
Ledgers.createViaApi(defaultLedger).then((ledgerResponse) => {
defaultLedger.id = ledgerResponse.id;
defaultFund.ledgerId = defaultLedger.id;
defaultFund.donorOrganizationIds = [firstOrganization.id, secondOrganization.id];
Funds.createViaApi(defaultFund).then((fundResponse) => {
defaultFund.id = fundResponse.fund.id;
FiscalYears.createViaApi(firstFiscalYear).then((firstFiscalYearResponse) => {
firstFiscalYear.id = firstFiscalYearResponse.id;
firstBudget.fiscalYearId = firstFiscalYearResponse.id;
defaultLedger.fiscalYearOneId = firstFiscalYear.id;
Ledgers.createViaApi(defaultLedger).then((ledgerResponse) => {
defaultLedger.id = ledgerResponse.id;
defaultFund.ledgerId = defaultLedger.id;

cy.loginAsAdmin({ path: TopMenu.fundPath, waiter: Funds.waitLoading });
FinanceHelp.searchByName(defaultFund.name);
Funds.selectFund(defaultFund.name);
Funds.addBudget(allocatedQuantity);
});
});
Funds.createViaApi(defaultFund).then((fundResponse) => {
defaultFund.id = fundResponse.fund.id;
firstBudget.fundId = fundResponse.fund.id;
Budgets.createViaApi(firstBudget);
});
},
);
});
});
});

ServicePoints.getViaApi().then((servicePoint) => {
servicePointId = servicePoint[0].id;
NewLocation.createViaApi(NewLocation.getDefaultLocation(servicePointId)).then((res) => {
location = res;
ServicePoints.getViaApi().then((servicePoint) => {
servicePointId = servicePoint[0].id;
NewLocation.createViaApi(NewLocation.getDefaultLocation(servicePointId)).then((res) => {
location = res;
});
});
});

defaultOrder.vendor = firstOrganization.name;
cy.visit(TopMenu.ordersPath);
Orders.createApprovedOrderForRollover(defaultOrder, true).then((firstOrderResponse) => {
defaultOrder.id = firstOrderResponse.id;
orderNumber = firstOrderResponse.poNumber;
Orders.checkCreatedOrder(defaultOrder);
defaultOrder.vendor = firstOrganization.id;
Orders.createOrderViaApi(defaultOrder).then((firstOrderResponse) => {
defaultOrder.id = firstOrderResponse.id;
orderNumber = firstOrderResponse.poNumber;
});
});

cy.createTempUser([permissions.uiOrdersCreate.gui, permissions.uiOrdersEdit.gui]).then(
(userProperties) => {
user = userProperties;
Expand Down
Loading
Loading