Skip to content

Commit 495c1aa

Browse files
committed
fix: lint
1 parent 56098c4 commit 495c1aa

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

src/models/releasesFactory.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,3 @@ export default class ReleasesFactory {
5050
return doc;
5151
}
5252
}
53-
54-

src/resolvers/project.js

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ const { ApolloError, UserInputError } = require('apollo-server-express');
66
const Validator = require('../utils/validator');
77
const EventsFactory = require('../models/eventsFactory');
88
const getEventsFactory = require('./helpers/eventsFactory').default;
9-
const ReleasesFactory = require('../models/releasesFactory').default;
109
const ProjectToWorkspace = require('../models/projectToWorkspace');
1110
const { dateFromObjectId } = require('../utils/dates');
1211
const ProjectModel = require('../models/project').default;
@@ -575,26 +574,34 @@ module.exports = {
575574
const releasesFactory = factories.releasesFactory;
576575
const releaseDoc = await releasesFactory.findByProjectAndRelease(project._id, release);
577576

578-
let enrichedFiles = Array.isArray(releaseDoc?.files) ? releaseDoc.files : [];
577+
let enrichedFiles = Array.isArray(releaseDoc.files) ? releaseDoc.files : [];
579578

580579
if (enrichedFiles.length > 0) {
581580
try {
582581
const filesColl = mongo.databases.events.collection('releases.files');
583582

584-
const ids = [...new Set(
583+
const ids = [ ...new Set(
585584
enrichedFiles
586585
.filter(f => f && typeof f === 'object' && f._id)
587586
.map(f => String(f._id))
588-
)].map(id => new ObjectId(id));
587+
) ].map(id => new ObjectId(id));
589588

590589
if (ids.length > 0) {
591590
const filesInfo = await filesColl.find(
592591
{ _id: { $in: ids } },
593-
{ projection: { length: 1, uploadDate: 1 } }
592+
{
593+
projection: {
594+
length: 1,
595+
uploadDate: 1,
596+
},
597+
}
594598
).toArray();
595599

596600
const metaById = new Map(
597-
filesInfo.map(doc => [String(doc._id), { length: doc.length, uploadDate: doc.uploadDate }])
601+
filesInfo.map(doc => [String(doc._id), {
602+
length: doc.length,
603+
uploadDate: doc.uploadDate,
604+
} ])
598605
);
599606

600607
enrichedFiles = enrichedFiles.map((entry) => {
@@ -607,25 +614,25 @@ module.exports = {
607614
return {
608615
mapFileName: entry.mapFileName,
609616
originFileName: entry.originFileName,
610-
length: meta?.length ?? null,
611-
uploadDate: meta?.uploadDate ?? null,
617+
length: meta.length ? meta.length : null,
618+
uploadDate: meta.uploadDate ? meta.uploadDate : null,
612619
};
613620
});
614621
}
615622
} catch (e) {
616623
// In case of any error with enrichment, fallback to original structure
617-
enrichedFiles = releaseDoc?.files || [];
624+
enrichedFiles = releaseDoc.files ? releaseDoc.files : [];
618625
}
619626
}
620627

621628
return {
622629
release,
623630
projectId: project._id,
624-
commitsCount: Array.isArray(releaseDoc?.commits) ? releaseDoc.commits.length : 0,
625-
filesCount: Array.isArray(releaseDoc?.files) ? releaseDoc.files.length : 0,
626-
commits: releaseDoc?.commits || [],
631+
commitsCount: Array.isArray(releaseDoc.commits) ? releaseDoc.commits.length : 0,
632+
filesCount: Array.isArray(releaseDoc.files) ? releaseDoc.files.length : 0,
633+
commits: releaseDoc.commits ? releaseDoc.commits : [],
627634
files: enrichedFiles,
628-
timestamp: releaseDoc?._id ? dateFromObjectId(releaseDoc._id) : null,
635+
timestamp: releaseDoc._id ? dateFromObjectId(releaseDoc._id) : null,
629636
};
630637
},
631638
},

0 commit comments

Comments
 (0)