artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 17:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

test/fixed the merge issue

Browse Source
This commit is contained in:
hongwei 2022-10-04 11:29:56 +02:00
parent b3ff1474ff
commit ca05744a52
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala
View File

@ -1285,7 +1285,7 @@ object SwaggerDefinitionsJSON {
highest_education_attained = ExampleValue.highestEducationAttainedExample.value,
employment_status = ExampleValue.employmentStatusExample.value,
kyc_status = ExampleValue.kycStatusExample.value.toBoolean,
last_ok_date = DefaultFromDate
last_ok_date = oneYearAgoDate
)
val customerJsonV140 = CustomerJsonV140(
@ -1302,7 +1302,7 @@ object SwaggerDefinitionsJSON {
highest_education_attained = ExampleValue.highestEducationAttainedExample.value,
employment_status = ExampleValue.employmentStatusExample.value,
kyc_status = ExampleValue.kycStatusExample.value.toBoolean,
last_ok_date = DefaultFromDate
last_ok_date = oneYearAgoDate
)
val customersJsonV140 = CustomersJsonV140(
@ -2006,7 +2006,7 @@ object SwaggerDefinitionsJSON {
highest_education_attained = ExampleValue.highestEducationAttainedExample.value,
employment_status = ExampleValue.employmentStatusExample.value,
kyc_status = ExampleValue.kycStatusExample.value.toBoolean,
last_ok_date = DefaultFromDate
last_ok_date = oneYearAgoDate
)
val transactionRequestJsonV200 = TransactionRequestJsonV200(
@ -2142,7 +2142,7 @@ object SwaggerDefinitionsJSON {
highest_education_attained = ExampleValue.highestEducationAttainedExample.value,
employment_status = ExampleValue.employmentStatusExample.value,
kyc_status = ExampleValue.kycStatusExample.value.toBoolean,
last_ok_date = DefaultFromDate
last_ok_date = oneYearAgoDate
)
val customerJSONs = CustomerJSONs(customers = List(customerJsonV210))
@ -2178,7 +2178,7 @@ object SwaggerDefinitionsJSON {
highest_education_attained = ExampleValue.highestEducationAttainedExample.value,
employment_status = ExampleValue.employmentStatusExample.value,
kyc_status = ExampleValue.kycStatusExample.value.toBoolean,
last_ok_date = DefaultFromDate
last_ok_date = oneYearAgoDate
)
val customerJsonV300 = CustomerJsonV300(
@ -2198,7 +2198,7 @@ object SwaggerDefinitionsJSON {
highest_education_attained = ExampleValue.highestEducationAttainedExample.value,
employment_status = ExampleValue.employmentStatusExample.value,
kyc_status = ExampleValue.kycStatusExample.value.toBoolean,
last_ok_date = DefaultFromDate,
last_ok_date = oneYearAgoDate,
title = ExampleValue.titleExample.value,
branch_id = ExampleValue.branchIdExample.value,
name_suffix = ExampleValue.nameSuffixExample.value
@ -2227,7 +2227,7 @@ object SwaggerDefinitionsJSON {
highest_education_attained = ExampleValue.highestEducationAttainedExample.value,
employment_status = ExampleValue.employmentStatusExample.value,
kyc_status = ExampleValue.kycStatusExample.value.toBoolean,
last_ok_date = DefaultFromDate,
last_ok_date = oneYearAgoDate,
title = ExampleValue.titleExample.value,
branch_id = ExampleValue.branchIdExample.value,
name_suffix = ExampleValue.nameSuffixExample.value
@ -2247,7 +2247,7 @@ object SwaggerDefinitionsJSON {
highest_education_attained = Some(ExampleValue.highestEducationAttainedExample.value),
employment_status = Some(ExampleValue.employmentStatusExample.value),
kyc_status = Some(ExampleValue.kycStatusExample.value.toBoolean),
last_ok_date = Some(DefaultFromDate),
last_ok_date = Some(oneYearAgoDate),
title = Some(ExampleValue.titleExample.value),
branch_id = Some(ExampleValue.branchIdExample.value),
name_suffix = Some(ExampleValue.nameSuffixExample.value)
@ -2270,7 +2270,7 @@ object SwaggerDefinitionsJSON {
highest_education_attained = ExampleValue.highestEducationAttainedExample.value,
employment_status = ExampleValue.employmentStatusExample.value,
kyc_status = ExampleValue.kycStatusExample.value.toBoolean,
last_ok_date = DefaultFromDate,
last_ok_date = oneYearAgoDate,
title = ExampleValue.titleExample.value,
branch_id = ExampleValue.branchIdExample.value,
name_suffix = ExampleValue.nameSuffixExample.value
@ -2300,7 +2300,7 @@ object SwaggerDefinitionsJSON {
highest_education_attained = ExampleValue.highestEducationAttainedExample.value,
employment_status = ExampleValue.employmentStatusExample.value,
kyc_status = ExampleValue.kycStatusExample.value.toBoolean,
last_ok_date = DefaultFromDate,
last_ok_date = oneYearAgoDate,
title = ExampleValue.titleExample.value,
branch_id = ExampleValue.branchIdExample.value,
name_suffix = ExampleValue.nameSuffixExample.value,
@ -2324,7 +2324,7 @@ object SwaggerDefinitionsJSON {
highest_education_attained = ExampleValue.highestEducationAttainedExample.value,
employment_status = ExampleValue.employmentStatusExample.value,
kyc_status = ExampleValue.kycStatusExample.value.toBoolean,
last_ok_date = DefaultFromDate,
last_ok_date = oneYearAgoDate,
title = ExampleValue.titleExample.value,
branch_id = ExampleValue.branchIdExample.value,
name_suffix = ExampleValue.nameSuffixExample.value,

1
obp-api/src/main/scala/code/api/util/APIUtil.scala
View File

@ -159,6 +159,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
oneYearAgo.getTime()
}
def DefaultToDate = new Date()
def oneYearAgoDate = oneYearAgo(DefaultToDate)
val theEpochTime: Date = new Date(0) // Set epoch time. The Unix epoch is 00:00:00 UTC on 1 January 1970.
def formatDate(date : Date) : String = {