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

load projects and samples #114

Merged
merged 17 commits into from
May 21, 2021
+104 −6
Merged

load projects and samples #114

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
54733d8
redoing the ticket
StefanBabukov May 16, 2021
3c25dbc
fix
StefanBabukov May 16, 2021
b76dcf8
fixes
StefanBabukov May 17, 2021
5e8cf39
fixes
StefanBabukov May 19, 2021
c151211
fixes
StefanBabukov May 19, 2021
eb7eec6
comment fixe
StefanBabukov May 19, 2021
c660595
fixes
StefanBabukov May 19, 2021
2abca9e
move to inside function
StefanBabukov May 19, 2021
1e189e2
change
StefanBabukov May 19, 2021
f2cb9a1
Refactor code to work better with async/await
marcellp May 20, 2021
25bf06f
Make sure keys returned to getProjectsFromIds are unqiue.
marcellp May 20, 2021
43c4734
Convert projectIds into an Array
marcellp May 20, 2021
158ba33
Fix conversion error between keys
marcellp May 20, 2021
69a3ab4
Add array spreading to other reference to projectIds
marcellp May 20, 2021
997d8a7
Add array spreading to other references to projectIds
marcellp May 20, 2021
e0c8eb6
Make module to filter out orphaned experiments more explicit
marcellp May 20, 2021
adbbc4d
Remove based on items
marcellp May 20, 2021
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
14 changes: 14 additions & 0 deletions src/api/route-services/projects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,20 @@ class ProjectsService {
}
}

async getProjects() {
const params = {
TableName: this.tableName,
};
const dynamodb = createDynamoDbInstance();
const response = await dynamodb.scan(params).promise();
Copy link
Member

@cosa65 cosa65 May 18, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This scan will need to be over the experiments table (and only getting projectId), then with the projectIds you find there you'll need ot get the projects from projects table (some of the experiments won't have projectIds so you could deal with that by adding a FilterExpression with attribute_exists in the params).

For loading projects based on the projectIds you got from experiments you could use BatchGetItem https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB.html#batchGetItem-property,
also keep in mind that the experiments table has projectId field while projects table has projectUuid, so there's a decision here, either using projectId and changing the projects and samples tables or projectUuid and changing the experiments table. (or just doing a _.transform() between the result of the experiments scan and the projects batch get to change projectId -> projectUuid and leave this matter for some future refactoring) .

const projects = [];
response.Items.forEach((item) => {
const project = convertToJsObject(item);
projects.push(project.projects);
});
return projects;
}

async deleteProject(projectUuid) {
logger.log(`Deleting project with id ${projectUuid}`);
const marshalledKey = convertToDynamoDbRecord({
Expand Down
9 changes: 6 additions & 3 deletions src/api/route-services/samples.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,17 @@ class SamplesService {

const response = await dynamodb.query(params).promise();

if (response.Item) {
const prettyResponse = convertToJsObject(response.Item);
const items = response.Items ? response.Items[0] : response.Item;
marcellp marked this conversation as resolved.
Show resolved Hide resolved

if (items) {
const prettyResponse = convertToJsObject(items);
return prettyResponse;
}

throw new NotFoundError('Samples not found');
throw new NotFoundError('Samples not found!');
}


async getSamplesByExperimentId(experimentId) {
logger.log(`Gettings samples using experimentId : ${experimentId}`);
const marshalledKey = convertToDynamoDbRecord({
Expand Down
5 changes: 5 additions & 0 deletions src/api/routes/projects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,9 @@ module.exports = {
.then((data) => res.json(data))
.catch(next);
},

'projects#get': (req, res, next) => {
projectsService.getProjects().then((response) => res.json(response)).catch(next);
},

};
18 changes: 17 additions & 1 deletion src/specs/api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,4 +561,20 @@ paths:
experimentId:
type: string
samples:
$ref: ./models/api-body-schemas/Samples.v1.yaml
$ref: ./models/api-body-schemas/Samples.v1.yaml
'/projects':
get:
summary: ''
operationId: getProjects
x-eov-operation-id: projects#get
ivababukova marked this conversation as resolved.
Show resolved Hide resolved
x-eov-operation-handler: routes/projects
responses:
'200':
description: OK
content:
application/json:
schema:
type: array
items:
$ref: ./models/api-body-schemas/Project.v1.yaml
description: Get the projects