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.

Sign up for GitHub

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

Jump to bottom

(feat): support for "begins_with" operator searches #196

Merged
merged 10 commits into from
Feb 1, 2022
Merged

(feat): support for "begins_with" operator searches #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ea6f07f
(chore): Defines begins_with operator
sagarbaver Jul 10, 2021
152b395
Merge branch 'master' into feat-begins-with-operator
sagarbaver Jan 29, 2022
397f17f
(feat): Adds support for begins_with operator
sagarbaver Jan 29, 2022
43821e6
(fix): Fixes formatting
sagarbaver Jan 29, 2022
fd78808
(fix): Fixes formatting
sagarbaver Jan 29, 2022
0d246e4
(fix): Fixes formatting and removes vscode's launch json
sagarbaver Jan 29, 2022
a4ace46
(feat): Adds support for begins_with operator for FilterExpressions
sagarbaver Jan 30, 2022
a8a81ad
(fix): Changes back the port number
sagarbaver Jan 30, 2022
b869364
(refactor): Incorporates review suggestion from @rchl
sagarbaver Jan 30, 2022
fddb7e2
(refactor): Incorporates feedback from @rchl
sagarbaver Jan 31, 2022
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
node_modules
yarn.lock
.idea/
.vscode/
.npmrc
26 changes: 20 additions & 6 deletions lib/backend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ exports.createServer = (dynamodb, docClient) => {
}
}


if (secondaryIndex.IndexType === 'global') {
index.ProvisionedThroughput = {
ReadCapacityUnits: req.body.ReadCapacityUnits,
Expand Down Expand Up @@ -400,6 +399,7 @@ exports.createServer = (dynamodb, docClient) => {
'<=': '<=',
'>': '>',
'<': '<',
'begins_with': 'begins_with'
},
attributeTypes: {
'S': 'String',
Expand Down Expand Up @@ -441,20 +441,33 @@ exports.createServer = (dynamodb, docClient) => {

// Create a variable to uniquely identify each expression attribute
let i = 0

for (const key in filters) {
if (filters[key].type === 'N') {
filters[key].value = Number(filters[key].value)
}

ExpressionAttributeNames[`#key${i}`] = key
ExpressionAttributeValues[`:key${i}`] = filters[key].value
if (indexBeingUsed && indexBeingUsed.KeySchema.find(
(keySchemaItem) => keySchemaItem.AttributeName === key)
) {
KeyConditionExpression.push(`#key${i} ${filters[key].operator} :key${i}`)
const matchedKeySchema = indexBeingUsed ? indexBeingUsed.KeySchema.find(
(keySchemaItem) => keySchemaItem.AttributeName === key) : undefined

if (matchedKeySchema) {
// Only the Range key can support begins_with operator
if (matchedKeySchema.KeyType === 'RANGE' && filters[key].operator === 'begins_with') {
KeyConditionExpression.push(`${filters[key].operator} ( #key${i} , :key${i})`)
} else {
KeyConditionExpression.push(`#key${i} ${filters[key].operator} :key${i}`)
}
} else {
ExpressionAttributeNames[`#key${i}`] = key
ExpressionAttributeValues[`:key${i}`] = filters[key].value
FilterExpressions.push(`#key${i} ${filters[key].operator} :key${i}`)

if (filters[key].operator === 'begins_with') {
FilterExpressions.push(`${filters[key].operator} ( #key${i} , :key${i})`)
} else {
FilterExpressions.push(`#key${i} ${filters[key].operator} :key${i}`)
}
}
// Increment the unique ID variable
i = i + 1
Expand Down Expand Up @@ -658,6 +671,7 @@ exports.createServer = (dynamodb, docClient) => {

return app
}

function isAttributeNotAlreadyCreated(attributeDefinitions, attributeName) {
return !attributeDefinitions
.find(attributeDefinition => attributeDefinition.AttributeName === attributeName)
Expand Down
61 changes: 22 additions & 39 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion views/scan.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
<% } %>
</select>
</td>
<td style="width: 80px">
<td style="width: 140px">
<select class="form-control filter-row-operator">
<% for (const operator in operators) { %>
<option value="<%= operator %>"><%= operators[operator] %></option>
Expand Down