Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@mfriesen
mfriesen committed Jun 6, 2024
1 parent 5603d95 commit 7c43aa2
Show file tree
Hide file tree
Showing 8 changed files with 232 additions and 8 deletions.
37 changes: 37 additions & 0 deletions docs/openapi/openapi-iam.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1832,6 +1832,12 @@
application/json:
schema:
$ref: '#/components/schemas/DocumentFulltextResponse'
"400":
description: 400 OK
content:
application/json:
schema:
$ref: '#/components/schemas/ValidationErrorsResponse'
security:
- ApiAuthorization: []
x-amazon-apigateway-integration:
Expand Down Expand Up @@ -6310,6 +6316,37 @@
description: List of search tags
items:
$ref: '#/components/schemas/DocumentFulltextTag'
attributes:
type: array
description: List of search attributes
items:
$ref: '#/components/schemas/DocumentFulltextAttribute'
DocumentFulltextAttribute:
required:
- key
type: object
properties:
eq:
$ref: '#/components/schemas/DocumentFulltextAttributeEq'
eqOr:
type: array
description: Searches for ANY strings that eq
items:
$ref: '#/components/schemas/DocumentFulltextAttributeEq'
key:
type: string
description: Tag key to search
DocumentFulltextAttributeEq:
properties:
stringValue:
type: string
description: Search for string value
numberValue:
type: number
description: Search for number value
booleanValue:
type: boolean
description: Search for boolean value
DocumentFulltextTag:
required:
- key
Expand Down
37 changes: 37 additions & 0 deletions docs/openapi/openapi-jwt.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1832,6 +1832,12 @@
application/json:
schema:
$ref: '#/components/schemas/DocumentFulltextResponse'
"400":
description: 400 OK
content:
application/json:
schema:
$ref: '#/components/schemas/ValidationErrorsResponse'
security:
- ApiAuthorization: []
x-amazon-apigateway-integration:
Expand Down Expand Up @@ -6310,6 +6316,37 @@
description: List of search tags
items:
$ref: '#/components/schemas/DocumentFulltextTag'
attributes:
type: array
description: List of search attributes
items:
$ref: '#/components/schemas/DocumentFulltextAttribute'
DocumentFulltextAttribute:
required:
- key
type: object
properties:
eq:
$ref: '#/components/schemas/DocumentFulltextAttributeEq'
eqOr:
type: array
description: Searches for ANY strings that eq
items:
$ref: '#/components/schemas/DocumentFulltextAttributeEq'
key:
type: string
description: Tag key to search
DocumentFulltextAttributeEq:
properties:
stringValue:
type: string
description: Search for string value
numberValue:
type: number
description: Search for number value
booleanValue:
type: boolean
description: Search for boolean value
DocumentFulltextTag:
required:
- key
Expand Down
37 changes: 37 additions & 0 deletions docs/openapi/openapi-key.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1832,6 +1832,12 @@
application/json:
schema:
$ref: '#/components/schemas/DocumentFulltextResponse'
"400":
description: 400 OK
content:
application/json:
schema:
$ref: '#/components/schemas/ValidationErrorsResponse'
security:
- ApiAuthorization: []
x-amazon-apigateway-integration:
Expand Down Expand Up @@ -6310,6 +6316,37 @@
description: List of search tags
items:
$ref: '#/components/schemas/DocumentFulltextTag'
attributes:
type: array
description: List of search attributes
items:
$ref: '#/components/schemas/DocumentFulltextAttribute'
DocumentFulltextAttribute:
required:
- key
type: object
properties:
eq:
$ref: '#/components/schemas/DocumentFulltextAttributeEq'
eqOr:
type: array
description: Searches for ANY strings that eq
items:
$ref: '#/components/schemas/DocumentFulltextAttributeEq'
key:
type: string
description: Tag key to search
DocumentFulltextAttributeEq:
properties:
stringValue:
type: string
description: Search for string value
numberValue:
type: number
description: Search for number value
booleanValue:
type: boolean
description: Search for boolean value
DocumentFulltextTag:
required:
- key
Expand Down
10 changes: 6 additions & 4 deletions ...cuments/src/main/java/com/formkiq/stacks/dynamodb/attributes/DocumentAttributeRecord.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,15 +287,13 @@ public String sk() {
@Override
public String skGsi1() {

String val = switch (this.valueType) {
return switch (this.valueType) {
case STRING, COMPOSITE_STRING -> this.stringValue;
case NUMBER -> formatDouble(this.numberValue);
case BOOLEAN -> this.booleanValue.toString();
case KEY_ONLY -> "#";
default -> throw new IllegalArgumentException("Unexpected value: " + this.valueType);
};

return val;
}

@Override
Expand Down Expand Up @@ -327,8 +325,10 @@ public DocumentAttributeRecord valueType(final DocumentAttributeValueType attrib

/**
* Update Value Type.
*
* @return DocumentAttributeRecord
*/
public void updateValueType() {
public DocumentAttributeRecord updateValueType() {
this.valueType = DocumentAttributeValueType.KEY_ONLY;

if (!Strings.isEmpty(this.stringValue)) {
Expand All @@ -338,5 +338,7 @@ public void updateValueType() {
} else if (this.booleanValue != null) {
this.valueType = DocumentAttributeValueType.BOOLEAN;
}

return this;
}
}
37 changes: 37 additions & 0 deletions lambda-api-graalvm/src/main/resources/cloudformation/openapi-iam.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1847,6 +1847,12 @@ Resources:
application/json:
schema:
$ref: '#/components/schemas/DocumentFulltextResponse'
'400':
description: 400 OK
content:
application/json:
schema:
$ref: '#/components/schemas/ValidationErrorsResponse'
security:
- ApiAuthorization: []
x-amazon-apigateway-integration:
Expand Down Expand Up @@ -6345,6 +6351,37 @@ Resources:
description: "List of search tags"
items:
$ref: "#/components/schemas/DocumentFulltextTag"
attributes:
type: "array"
description: "List of search attributes"
items:
$ref: "#/components/schemas/DocumentFulltextAttribute"
DocumentFulltextAttribute:
required:
- "key"
type: "object"
properties:
eq:
$ref: "#/components/schemas/DocumentFulltextAttributeEq"
eqOr:
type: array
description: "Searches for ANY strings that eq"
items:
$ref: "#/components/schemas/DocumentFulltextAttributeEq"
key:
type: "string"
description: "Tag key to search"
DocumentFulltextAttributeEq:
properties:
stringValue:
type: "string"
description: "Search for string value"
numberValue:
type: "number"
description: "Search for number value"
booleanValue:
type: "boolean"
description: "Search for boolean value"
DocumentFulltextTag:
required:
- "key"
Expand Down
37 changes: 37 additions & 0 deletions lambda-api-graalvm/src/main/resources/cloudformation/openapi-jwt.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1847,6 +1847,12 @@ Resources:
application/json:
schema:
$ref: '#/components/schemas/DocumentFulltextResponse'
'400':
description: 400 OK
content:
application/json:
schema:
$ref: '#/components/schemas/ValidationErrorsResponse'
security:
- ApiAuthorization: []
x-amazon-apigateway-integration:
Expand Down Expand Up @@ -6345,6 +6351,37 @@ Resources:
description: "List of search tags"
items:
$ref: "#/components/schemas/DocumentFulltextTag"
attributes:
type: "array"
description: "List of search attributes"
items:
$ref: "#/components/schemas/DocumentFulltextAttribute"
DocumentFulltextAttribute:
required:
- "key"
type: "object"
properties:
eq:
$ref: "#/components/schemas/DocumentFulltextAttributeEq"
eqOr:
type: array
description: "Searches for ANY strings that eq"
items:
$ref: "#/components/schemas/DocumentFulltextAttributeEq"
key:
type: "string"
description: "Tag key to search"
DocumentFulltextAttributeEq:
properties:
stringValue:
type: "string"
description: "Search for string value"
numberValue:
type: "number"
description: "Search for number value"
booleanValue:
type: "boolean"
description: "Search for boolean value"
DocumentFulltextTag:
required:
- "key"
Expand Down
37 changes: 37 additions & 0 deletions lambda-api-graalvm/src/main/resources/cloudformation/openapi-key.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1847,6 +1847,12 @@ Resources:
application/json:
schema:
$ref: '#/components/schemas/DocumentFulltextResponse'
'400':
description: 400 OK
content:
application/json:
schema:
$ref: '#/components/schemas/ValidationErrorsResponse'
security:
- ApiAuthorization: []
x-amazon-apigateway-integration:
Expand Down Expand Up @@ -6345,6 +6351,37 @@ Resources:
description: "List of search tags"
items:
$ref: "#/components/schemas/DocumentFulltextTag"
attributes:
type: "array"
description: "List of search attributes"
items:
$ref: "#/components/schemas/DocumentFulltextAttribute"
DocumentFulltextAttribute:
required:
- "key"
type: "object"
properties:
eq:
$ref: "#/components/schemas/DocumentFulltextAttributeEq"
eqOr:
type: array
description: "Searches for ANY strings that eq"
items:
$ref: "#/components/schemas/DocumentFulltextAttributeEq"
key:
type: "string"
description: "Tag key to search"
DocumentFulltextAttributeEq:
properties:
stringValue:
type: "string"
description: "Search for string value"
numberValue:
type: "number"
description: "Search for number value"
booleanValue:
type: "boolean"
description: "Search for boolean value"
DocumentFulltextTag:
required:
- "key"
Expand Down
8 changes: 4 additions & 4 deletions lambda-api/src/integration/java/com/formkiq/stacks/api/awstest/FoldersRequestTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import com.formkiq.client.api.DocumentFoldersApi;
Expand Down Expand Up @@ -59,7 +59,7 @@ public class FoldersRequestTest extends AbstractAwsIntegrationTest {
* @throws Exception Exception
*/
@Test
@Timeout(unit = TimeUnit.SECONDS, value = TEST_TIMEOUT)
@Timeout(value = TEST_TIMEOUT)
public void testDeleteFolders01() throws Exception {
// given
for (String siteId : Arrays.asList(null, UUID.randomUUID().toString())) {
Expand Down Expand Up @@ -95,7 +95,7 @@ public void testDeleteFolders01() throws Exception {
* @throws Exception Exception
*/
@Test
@Timeout(unit = TimeUnit.SECONDS, value = TEST_TIMEOUT)
@Timeout(value = TEST_TIMEOUT)
public void testGetFolders01() throws Exception {
// given
for (String siteId : Arrays.asList(null, UUID.randomUUID().toString())) {
Expand All @@ -122,7 +122,7 @@ public void testGetFolders01() throws Exception {
* @throws Exception Exception
*/
@Test
@Timeout(unit = TimeUnit.SECONDS, value = TEST_TIMEOUT)
@Timeout(value = TEST_TIMEOUT)
public void testPostFolders01() throws Exception {
// given
for (String siteId : Arrays.asList(null, UUID.randomUUID().toString())) {
Expand Down

0 comments on commit 7c43aa2

Please sign in to comment.