r/p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull requests Releases 1 Wiki Activity

delete file from s3 if data environment variable is undefined

Browse source
This commit is contained in:
Cassie Tarakajian 2017-03-30 17:28:28 -04:00
parent 8392acdf3f
commit 23560c7879
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/controllers/file.controller.js
View file

@ -46,8 +46,10 @@ function deleteMany(files, ids) {
const objectKeys = []; const objectKeys = [];
each(ids, (id, cb) => { each(ids, (id, cb) => {
if (files.id(id).url && moment(process.env.S3_DATE) < moment(files.id(id).createdAt)) { if (files.id(id).url) {
objectKeys.push(files.id(id).url.split("/").pop()); if (!process.env.S3_DATE || (process.env.S3_DATE && moment(process.env.S3_DATE) < moment(files.id(id).createdAt))) {
objectKeys.push(files.id(id).url.split("/").pop());
}
} }
files.id(id).remove(); files.id(id).remove();
cb(); cb();

11
server/controllers/project.controller.js
View file

@ -92,8 +92,15 @@ export function getProject(req, res) {
function deleteFilesFromS3(files) { function deleteFilesFromS3(files) {
deleteObjectsFromS3( deleteObjectsFromS3(
files.filter((file) => file.url && moment(process.env.S3_DATE) < moment(file.createdAt)) files.filter((file) => {
.map((file) => file.url.split('/').pop()) if (file.url) {
if (!process.env.S3_DATE || (process.env.S3_DATE && moment(process.env.S3_DATE) < moment(file.createdAt))) {
return true;
}
}
return false;
})
.map((file) => file.url.split('/').pop())
); );
} }