Skip to content

Commit

Permalink
Set lastUpdatedDate
Browse files Browse the repository at this point in the history
  • Loading branch information
@stanislaw-zakrzewski
stanislaw-zakrzewski committed Oct 25, 2024
1 parent 929ea2a commit 1d275de
Showing 1 changed file with 45 additions and 37 deletions.
82 changes: 45 additions & 37 deletions data-serving/data-service/src/controllers/case.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,23 +59,26 @@ const caseFromDTO = async (receivedCase: CaseDTO) => {

const user = await User.findOne({ email: receivedCase.curator?.email });
if (user) {
logger.info(`User: ${JSON.stringify(user)}`)
logger.info(`User: ${JSON.stringify(user)}`);
if (user.roles.includes(Role.JuniorCurator)) {
aCase.curators = {
createdBy: {
name: user.name || '',
email: user.email
email: user.email,
},
};
} else if (user.roles.includes(Role.Curator) || user.roles.includes(Role.Admin)) {
} else if (
user.roles.includes(Role.Curator) ||
user.roles.includes(Role.Admin)
) {
aCase.curators = {
createdBy: {
name: user.name || '',
email: user.email
email: user.email,
},
verifiedBy: {
name: user.name || '',
email: user.email
email: user.email,
},
};
}
Expand All @@ -85,7 +88,7 @@ const caseFromDTO = async (receivedCase: CaseDTO) => {
};

const dtoFromCase = async (storedCase: CaseDocument) => {
let dto = (storedCase as unknown) as CaseDTO;
let dto = storedCase as unknown as CaseDTO;
const ageRange = await caseAgeRange(storedCase);
const creator = await User.findOne({
_id: storedCase.curators?.createdBy,
Expand All @@ -99,7 +102,7 @@ const dtoFromCase = async (storedCase: CaseDocument) => {
}

if (ageRange) {
if(creator) {
if (creator) {
if (verifier) {
dto = {
...dto,
Expand Down Expand Up @@ -131,15 +134,15 @@ const dtoFromCase = async (storedCase: CaseDocument) => {
demographics: {
...dto.demographics!,
ageRange,
}
},
};



// although the type system can't see it, there's an ageBuckets property on the demographics DTO now
delete ((dto as unknown) as {
demographics: { ageBuckets?: [ObjectId] };
}).demographics.ageBuckets;
delete (
dto as unknown as {
demographics: { ageBuckets?: [ObjectId] };
}
).demographics.ageBuckets;
}

return dto;
Expand Down Expand Up @@ -190,13 +193,14 @@ const updatedRevisionMetadata = (
day0Case: CaseDocument,
curator: string,
note?: string,
date?: Date,
) => {
return {
creationMetadata: day0Case.revisionMetadata.creationMetadata,
updateMetadata: {
curator: curator,
note: note,
date: Date.now(),
date: date || new Date(),
},
revisionNumber: day0Case.revisionMetadata.revisionNumber + 1,
};
Expand Down Expand Up @@ -516,8 +520,8 @@ export class CasesController {
// Get total case cardinality
const grandTotalCount = await Day0Case.countDocuments({
caseStatus: {
$nin: [CaseStatus.OmitError, CaseStatus.Discarded]
}
$nin: [CaseStatus.OmitError, CaseStatus.Discarded],
},
});
if (grandTotalCount === 0) {
res.status(200).json({});
Expand All @@ -529,9 +533,9 @@ export class CasesController {
{
$match: {
caseStatus: {
$nin: [CaseStatus.OmitError, CaseStatus.Discarded]
}
}
$nin: [CaseStatus.OmitError, CaseStatus.Discarded],
},
},
},
{
$group: {
Expand Down Expand Up @@ -584,9 +588,9 @@ export class CasesController {
$ne: null,
},
caseStatus: {
$nin: [CaseStatus.OmitError, CaseStatus.Discarded]
}
}
$nin: [CaseStatus.OmitError, CaseStatus.Discarded],
},
},
},
{
$group: {
Expand Down Expand Up @@ -656,9 +660,9 @@ export class CasesController {
{
$match: {
caseStatus: {
$nin: [CaseStatus.OmitError, CaseStatus.Discarded]
}
}
$nin: [CaseStatus.OmitError, CaseStatus.Discarded],
},
},
},
{
$group: {
Expand Down Expand Up @@ -690,9 +694,9 @@ export class CasesController {
{
$match: {
caseStatus: {
$nin: [CaseStatus.OmitError, CaseStatus.Discarded]
}
}
$nin: [CaseStatus.OmitError, CaseStatus.Discarded],
},
},
},
{
$match: {
Expand Down Expand Up @@ -753,7 +757,7 @@ export class CasesController {

try {
this.addGeoResolution(req);
const currentDate = Date.now();
const currentDate: Date = new Date();
const curator = req.body.curator.email;
const receivedCase = {
...req.body,
Expand All @@ -770,6 +774,7 @@ export class CasesController {
},
},
} as CaseDTO;
receivedCase.events.dateLastModified = currentDate;

const c = fillEmpty(new Day0Case(await caseFromDTO(receivedCase)));

Expand All @@ -795,7 +800,7 @@ export class CasesController {
res.status(201).json(result);
} catch (e) {
const err = e as Error;
if (err.name === 'MongoServerError') {
if (err.name === 'MongoServerError') {
logger.error((e as any).errInfo);
res.status(422).json({
message: (err as any).errInfo,
Expand Down Expand Up @@ -849,6 +854,7 @@ export class CasesController {
});
return;
} else {
const updateDate = new Date();
c.set({
curators: {
createdBy: c.curators.createdBy,
Expand All @@ -858,7 +864,9 @@ export class CasesController {
c,
req.body.curator.email,
'Case Verification',
updateDate,
),
'events.dateLastModified': updateDate,
});
await c.save();
const responseCase = await Day0Case.find({
Expand Down Expand Up @@ -1088,14 +1096,16 @@ export class CasesController {
return;
}
const caseDetails = await caseFromDTO(req.body);

const updateDate = new Date();
c.set({
...caseDetails,
revisionMetadata: updatedRevisionMetadata(
c,
req.body.curator.email,
'Case Update',
updateDate,
),
'events.dateLastModified': updateDate,
});
await c.save();

Expand Down Expand Up @@ -1422,13 +1432,11 @@ export const casesMatchingSearchQuery = (opts: {
}

// Always search with case-insensitivity.
const casesQuery: Query<CaseDocument[], CaseDocument> = Day0Case.find(
queryOpts,
);
const casesQuery: Query<CaseDocument[], CaseDocument> =
Day0Case.find(queryOpts);

const countQuery: Query<number, CaseDocument> = Day0Case.countDocuments(
queryOpts,
).limit(countLimit);
const countQuery: Query<number, CaseDocument> =
Day0Case.countDocuments(queryOpts).limit(countLimit);

// Fill in keyword filters.
parsedSearch.filters.forEach((f) => {
Expand Down

0 comments on commit 1d275de

Please sign in to comment.