-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MODEXPW-445] - Updated the "OrderLine" search for the DefaultConfig (#…
…495) * [MODEXPW-445] - Updated the "OrderLine" search for the DefaultConfig * [MODEXPW-445] - test updated * [MODEXPW-445] - test updated * [MODEXPW-445] - configQuery updated * [MODEXPW-445] - refactor * [MODEXPW-445] - tests updated
- Loading branch information
1 parent
2f65a97
commit 42e78a9
Showing
5 changed files
with
192 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
src/main/java/org/folio/dew/client/DataExportSpringClient.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,20 @@ | ||
| package org.folio.dew.client; | ||
|
|
||
| import org.folio.dew.domain.dto.ExportConfigCollection; | ||
| import org.folio.dew.domain.dto.Job; | ||
| import org.springframework.cloud.openfeign.FeignClient; | ||
| import org.springframework.http.MediaType; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
| import org.springframework.web.bind.annotation.PathVariable; | ||
| import org.springframework.web.bind.annotation.RequestParam; | ||
|
|
||
| @FeignClient(name = "data-export-spring") | ||
| public interface DataExportSpringClient { | ||
|
|
||
| @GetMapping(value = "/jobs/{jobId}", produces = MediaType.APPLICATION_JSON_VALUE) | ||
| Job getJobById(@PathVariable String jobId); | ||
|
|
||
| @GetMapping(value = "/configs", produces = MediaType.APPLICATION_JSON_VALUE) | ||
| ExportConfigCollection getExportConfigs(@RequestParam("query") String query); | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| { | ||
| "configs": [ | ||
| { | ||
| "id": "a96b3caa-f534-4f64-83a3-ed705665062e", | ||
| "type": "EDIFACT_ORDERS_EXPORT", | ||
| "tenant": "consortium", | ||
| "exportTypeSpecificParameters": { | ||
| "vendorEdiOrdersExportConfig": { | ||
| "exportConfigId": "a96b3caa-f534-4f64-83a3-ed705665062e", | ||
| "vendorId": "7baa459e-b99d-4f25-b918-9e367e1aa430", | ||
| "configName": "default", | ||
| "ediConfig": { | ||
| "defaultAcquisitionMethods": [ | ||
| "86d12634-b848-4968-adf0-5a95ce41c41b", | ||
| "df26d81b-9d63-4ff8-bf41-49bf75cfa70e" | ||
| ], | ||
| "ediNamingConvention": "{organizationCode}-{integrationName}-{exportJobEndDate}", | ||
| "libEdiCode": "default", | ||
| "libEdiType": "31B/US-SAN", | ||
| "vendorEdiCode": "default", | ||
| "vendorEdiType": "31B/US-SAN", | ||
| "sendAccountNumber": false, | ||
| "supportOrder": true, | ||
| "supportInvoice": false | ||
| }, | ||
| "ediFtp": { | ||
| "ftpConnMode": "Active", | ||
| "ftpFormat": "FTP", | ||
| "ftpMode": "ASCII", | ||
| "ftpPort": 22, | ||
| "invoiceDirectory": "/files", | ||
| "orderDirectory": "/files", | ||
| "password": "Ffx29%pu", | ||
| "serverAddress": "ftp://ftp.ci.folio.org", | ||
| "username": "folio" | ||
| }, | ||
| "ediSchedule": { | ||
| "enableScheduledExport": true, | ||
| "scheduleParameters": { | ||
| "id": "a96b3caa-f534-4f64-83a3-ed705665062e", | ||
| "scheduleFrequency": 1, | ||
| "schedulePeriod": "DAY", | ||
| "scheduleTime": "14:24:00", | ||
| "timeZone": "UTC" | ||
| } | ||
| }, | ||
| "isDefaultConfig": true | ||
| } | ||
| }, | ||
| "schedulePeriod": "NONE" | ||
| }, | ||
| { | ||
| "id": "411ca1a1-4547-4e4b-a873-0f3852cdf0e5", | ||
| "type": "EDIFACT_ORDERS_EXPORT", | ||
| "tenant": "consortium", | ||
| "exportTypeSpecificParameters": { | ||
| "vendorEdiOrdersExportConfig": { | ||
| "exportConfigId": "411ca1a1-4547-4e4b-a873-0f3852cdf0e5", | ||
| "vendorId": "7baa459e-b99d-4f25-b918-9e367e1aa430", | ||
| "configName": "neworg1", | ||
| "ediConfig": { | ||
| "accountNoList": [ | ||
| "org1", | ||
| "org2" | ||
| ], | ||
| "defaultAcquisitionMethods": [ | ||
| "796596c4-62b5-4b64-a2ce-524c747afaa2" | ||
| ], | ||
| "ediNamingConvention": "{organizationCode}-{integrationName}-{exportJobEndDate}", | ||
| "libEdiCode": "neworg1", | ||
| "libEdiType": "31B/US-SAN", | ||
| "vendorEdiCode": "neworg1", | ||
| "vendorEdiType": "31B/US-SAN", | ||
| "sendAccountNumber": false, | ||
| "supportOrder": true, | ||
| "supportInvoice": false | ||
| }, | ||
| "ediFtp": { | ||
| "ftpConnMode": "Active", | ||
| "ftpFormat": "FTP", | ||
| "ftpMode": "ASCII", | ||
| "ftpPort": 22, | ||
| "invoiceDirectory": "/files", | ||
| "orderDirectory": "/files", | ||
| "password": "Ffx29%pu", | ||
| "serverAddress": "ftp://ftp.ci.folio.org", | ||
| "username": "folio" | ||
| }, | ||
| "ediSchedule": { | ||
| "enableScheduledExport": true, | ||
| "scheduleParameters": { | ||
| "id": "411ca1a1-4547-4e4b-a873-0f3852cdf0e5", | ||
| "scheduleFrequency": 1, | ||
| "schedulePeriod": "DAY", | ||
| "scheduleTime": "14:26:00", | ||
| "timeZone": "UTC" | ||
| } | ||
| }, | ||
| "isDefaultConfig": false | ||
| } | ||
| }, | ||
| "schedulePeriod": "NONE" | ||
| } | ||
| ], | ||
| "totalRecords": 2 | ||
| } |