Skip to content

Commit 40244af

Browse files
mfriesenmfriesen
authored
V1.15.1 (#253)
### Updates * Console update to 3.6.2 * #239 - Add validation (400) when POST /search using 'text' along with 'tags', 'attributes' * #241 - Soft DELETE /document/{documentId} returns document not found * #242 - "Untagged" tag is added to document when using attributes * #248 - Add optional "documentId" to POST /documents, POST /documents/upload * #247 - Add MappingAttributeSourceType CONTENT_KEY_VALUE support * #251 - Add default content type for Google Docs ### Bugs Fixes * #237 - PUT/sites/{siteId}/classifications/{classificationId} "'name' is already used * #240 - Classification Schema: Adding an optional attribute that conflicts with site-level required schema * #244 - GET /mappings API missing mappingId from response * #245 - POST /users with invalid email gives 500 * #252 - Search for Document Attributes eqOr returns all records
1 parent dec1d1e commit 40244af

File tree

62 files changed

+2831
-627
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2831
-627
lines changed

‎aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/objects/Objects.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.util.Collections;
2929
import java.util.List;
3030
import java.util.Map;
31+
import java.util.stream.Stream;
3132

3233
/**
3334
*
@@ -50,7 +51,7 @@ public class Objects {
5051
*/
5152
public static String formatDouble(final Double val) {
5253

53-
String s = null;
54+
String s;
5455

5556
double dv = val.doubleValue();
5657
if (dv == (long) dv) {
@@ -170,4 +171,16 @@ public static void throwIfNull(final Object obj, final Exception ex) throws Exce
170171
throw ex;
171172
}
172173
}
174+
175+
/**
176+
* Merge two {@link List} together.
177+
*
178+
* @param <T> Type of {@link List}
179+
* @param t0 {@link List}
180+
* @param t1 {@link List}
181+
* @return {@link List}
182+
*/
183+
public static <T> List<T> concat(final List<T> t0, final List<T> t1) {
184+
return Stream.concat(notNull(t0).stream(), notNull(t1).stream()).toList();
185+
}
173186
}

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ repositories { mavenCentral() }
2727

2828
allprojects {
2929

30-
version = '1.15.0'
30+
version = '1.15.1'
3131

3232
ext.awsCognitoVersion = '1.5.4'
3333
group = 'com.formkiq.stacks'

‎console/src/integration/java/com/formkiq/stacks/console/awstest/AwsResourceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public void testS3Buckets() {
201201
*/
202202
@Test
203203
public void testSsmParameters() {
204-
assertEquals("v3.6.1",
204+
assertEquals("v3.6.2",
205205
ssmService.getParameterValue("/formkiq/" + appenvironment + "/console/version"));
206206
assertTrue(ssmService.getParameterValue("/formkiq/" + appenvironment + "/s3/Console")
207207
.contains(appenvironment + "-console-"));

‎console/src/main/resources/cloudformation/template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Parameters:
1717
ConsoleVersion:
1818
Type: String
1919
Description: Version of FormKiQ console to deploy
20-
Default: v3.6.1
20+
Default: v3.6.2
2121

2222
FormKiQType:
2323
Description: The type of FormKiQ installation

‎docs/openapi/openapi-iam.yaml

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
- OAuth(JWT)
3333
- AWS IAM
3434
- API Key
35-
version: 1.15.0
35+
version: 1.15.1
3636
tags:
3737
- name: documents
3838
description: API for the add, updating and fetching of documents
@@ -2135,6 +2135,7 @@
21352135
parameters:
21362136
- $ref: '#/components/parameters/siteIdParam'
21372137
- $ref: '#/components/parameters/documentIdParam'
2138+
- $ref: '#/components/parameters/ocrOutputTypeParam'
21382139
- $ref: '#/components/parameters/contentUrlParam'
21392140
- $ref: '#/components/parameters/textParam'
21402141
- $ref: '#/components/parameters/shareKeyParam'
@@ -6050,6 +6051,17 @@
60506051
enum:
60516052
- ACTIVE
60526053
- INACTIVE
6054+
ocrOutputTypeParam:
6055+
name: outputType
6056+
in: query
6057+
description: Output Format Type
6058+
required: false
6059+
schema:
6060+
type: string
6061+
enum:
6062+
- TEXT
6063+
- KEY_VALUE
6064+
- CONTENT_URL
60536065
limitParam:
60546066
name: limit
60556067
in: query
@@ -6186,14 +6198,14 @@
61866198
contentUrlParam:
61876199
name: contentUrl
61886200
in: query
6189-
description: Whether to return a "contentUrl", set value to 'true'
6201+
description: Whether to return a "contentUrl", set value to 'true' (deprecated)
61906202
required: false
61916203
schema:
61926204
type: string
61936205
textParam:
61946206
name: text
61956207
in: query
6196-
description: Returns raw 'text' of OCR content. e.g. AWS Textract returns JSON, setting parameter to 'true' converts JSON to Text
6208+
description: Returns raw 'text' of OCR content. e.g. AWS Textract returns JSON, setting parameter to 'true' converts JSON to Text (deprecated)
61976209
required: false
61986210
schema:
61996211
type: string
@@ -6975,6 +6987,9 @@
69756987
AddDocumentUploadRequest:
69766988
type: object
69776989
properties:
6990+
documentId:
6991+
type: string
6992+
description: optional Document Identifier, if skipped one will be assigned
69786993
tagSchemaId:
69796994
type: string
69806995
description: Tag Schema Id
@@ -7007,6 +7022,9 @@
70077022
- content
70087023
type: object
70097024
properties:
7025+
documentId:
7026+
type: string
7027+
description: optional Document Identifier, if skipped one will be assigned
70107028
tagSchemaId:
70117029
type: string
70127030
description: Tag Schema Id
@@ -8683,6 +8701,9 @@
86838701
Mapping:
86848702
type: object
86858703
properties:
8704+
mappingId:
8705+
type: string
8706+
description: Mapping Identifier
86868707
name:
86878708
type: string
86888709
description: Name of Mapping
@@ -8741,6 +8762,7 @@
87418762
description: Attribute Source Type
87428763
enum:
87438764
- CONTENT
8765+
- CONTENT_KEY_VALUE
87448766
- METADATA
87458767
GetAttributeResponse:
87468768
type: object
@@ -8970,6 +8992,16 @@
89708992
description: Action metadata
89718993
additionalProperties:
89728994
type: string
8995+
OcrKeyValues:
8996+
type: object
8997+
properties:
8998+
key:
8999+
type: string
9000+
description: Ocr Key
9001+
values:
9002+
type: array
9003+
items:
9004+
type: string
89739005
GetDocumentOcrResponse:
89749006
type: object
89759007
properties:
@@ -8978,6 +9010,11 @@
89789010
description: Presigned S3 Urls for the OCR content
89799011
items:
89809012
type: string
9013+
keyValues:
9014+
type: array
9015+
description: List of ocr key / values
9016+
items:
9017+
$ref: '#/components/schemas/OcrKeyValues'
89819018
data:
89829019
type: string
89839020
description: OCR text result
@@ -9616,7 +9653,7 @@
96169653
properties:
96179654
username:
96189655
type: string
9619-
description: Username of user
9656+
description: Email address of user
96209657
User:
96219658
type: object
96229659
properties:

‎docs/openapi/openapi-jwt.yaml

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
- OAuth(JWT)
3333
- AWS IAM
3434
- API Key
35-
version: 1.15.0
35+
version: 1.15.1
3636
tags:
3737
- name: documents
3838
description: API for the add, updating and fetching of documents
@@ -2135,6 +2135,7 @@
21352135
parameters:
21362136
- $ref: '#/components/parameters/siteIdParam'
21372137
- $ref: '#/components/parameters/documentIdParam'
2138+
- $ref: '#/components/parameters/ocrOutputTypeParam'
21382139
- $ref: '#/components/parameters/contentUrlParam'
21392140
- $ref: '#/components/parameters/textParam'
21402141
- $ref: '#/components/parameters/shareKeyParam'
@@ -6050,6 +6051,17 @@
60506051
enum:
60516052
- ACTIVE
60526053
- INACTIVE
6054+
ocrOutputTypeParam:
6055+
name: outputType
6056+
in: query
6057+
description: Output Format Type
6058+
required: false
6059+
schema:
6060+
type: string
6061+
enum:
6062+
- TEXT
6063+
- KEY_VALUE
6064+
- CONTENT_URL
60536065
limitParam:
60546066
name: limit
60556067
in: query
@@ -6186,14 +6198,14 @@
61866198
contentUrlParam:
61876199
name: contentUrl
61886200
in: query
6189-
description: Whether to return a "contentUrl", set value to 'true'
6201+
description: Whether to return a "contentUrl", set value to 'true' (deprecated)
61906202
required: false
61916203
schema:
61926204
type: string
61936205
textParam:
61946206
name: text
61956207
in: query
6196-
description: Returns raw 'text' of OCR content. e.g. AWS Textract returns JSON, setting parameter to 'true' converts JSON to Text
6208+
description: Returns raw 'text' of OCR content. e.g. AWS Textract returns JSON, setting parameter to 'true' converts JSON to Text (deprecated)
61976209
required: false
61986210
schema:
61996211
type: string
@@ -6975,6 +6987,9 @@
69756987
AddDocumentUploadRequest:
69766988
type: object
69776989
properties:
6990+
documentId:
6991+
type: string
6992+
description: optional Document Identifier, if skipped one will be assigned
69786993
tagSchemaId:
69796994
type: string
69806995
description: Tag Schema Id
@@ -7007,6 +7022,9 @@
70077022
- content
70087023
type: object
70097024
properties:
7025+
documentId:
7026+
type: string
7027+
description: optional Document Identifier, if skipped one will be assigned
70107028
tagSchemaId:
70117029
type: string
70127030
description: Tag Schema Id
@@ -8683,6 +8701,9 @@
86838701
Mapping:
86848702
type: object
86858703
properties:
8704+
mappingId:
8705+
type: string
8706+
description: Mapping Identifier
86868707
name:
86878708
type: string
86888709
description: Name of Mapping
@@ -8741,6 +8762,7 @@
87418762
description: Attribute Source Type
87428763
enum:
87438764
- CONTENT
8765+
- CONTENT_KEY_VALUE
87448766
- METADATA
87458767
GetAttributeResponse:
87468768
type: object
@@ -8970,6 +8992,16 @@
89708992
description: Action metadata
89718993
additionalProperties:
89728994
type: string
8995+
OcrKeyValues:
8996+
type: object
8997+
properties:
8998+
key:
8999+
type: string
9000+
description: Ocr Key
9001+
values:
9002+
type: array
9003+
items:
9004+
type: string
89739005
GetDocumentOcrResponse:
89749006
type: object
89759007
properties:
@@ -8978,6 +9010,11 @@
89789010
description: Presigned S3 Urls for the OCR content
89799011
items:
89809012
type: string
9013+
keyValues:
9014+
type: array
9015+
description: List of ocr key / values
9016+
items:
9017+
$ref: '#/components/schemas/OcrKeyValues'
89819018
data:
89829019
type: string
89839020
description: OCR text result
@@ -9616,7 +9653,7 @@
96169653
properties:
96179654
username:
96189655
type: string
9619-
description: Username of user
9656+
description: Email address of user
96209657
User:
96219658
type: object
96229659
properties:

0 commit comments

Comments
 (0)