refactor: minor type edits

Author: anantmittal

server/src/permissions/constants.ts

@@ -8,13 +8,13 @@ import {
 	isCreatedBySelf,
 	isSelf,
 	isToday
-} from './utils';
+} from '@/permissions/utils';
 
 export const ROLES = {
 	VOLUNTEER: 'VOLUNTEER',
 	MANAGER: 'MANAGER',
 	ADMIN: 'ADMIN',
-	SUPER_ADMIN: 'SUPER_ADMIN' // super admin de-prioritized for now
+	SUPER_ADMIN: 'SUPER_ADMIN'
 };
 
 // Native CASL actions -- CRUD + master action "manage"
@@ -113,7 +113,8 @@ export type Context = { userObjectId: string; latestLocationObjectId: string };
 export type Action = (typeof ACTION_ENUM)[number];
 export type Subject = (typeof SUBJECT_ENUM)[number];
 export type Condition = (typeof CONDITION_ENUM)[number];
-export type Query = ReturnType<(typeof CONDITION_QUERIES)[Condition]> | {}; // @typescript-eslint/no-empty-object-type
+
+export type Query = ReturnType<(typeof CONDITION_QUERIES)[Condition]> | object;
 // here, ForcedSubject is a type used when checking auth in our routes (i.e. building a dummy subject intead of just passing in a string)
 export type Ability = MongoAbility<
 	[Action, Subject | ForcedSubject<Subject>],

server/src/permissions/utils.ts

@@ -1,38 +1,40 @@
 // Returns a Mongo query filter that checks if the value of the given field is today
 // Made fieldName variable in case we want to have different checks for `updatedAt`/`createdAt`/`deletedAt`/etc.
-export function isToday(fieldName: string) {
+export function isToday(fieldName: string, timezone: string = 'UTC') {
 	const today = new Date();
 	return {
-		$expr: {
-			$eq: [
+		$expr: { // Allows use of aggregation operators in queries
+			$eq: [ // Checks equality between two values
+				// Value 1: The field from the document
 				{
-					$dateToString: { format: '%Y-%m-%d', date: `$${fieldName}` }
+					$dateToString: { format: '%Y-%m-%d', date: `$${fieldName}`, timezone }
 				},
-				{ $dateToString: { format: '%Y-%m-%d', date: today } }
+				// Value 2: Today's date
+				{ $dateToString: { format: '%Y-%m-%d', date: today, timezone } }
 			]
 		}
 	};
 }
 
-export function hasSameLocation(locationObjectId: string) {
+export function hasSameLocation(locationObjectId: string): { locationObjectId: string } {
 	return {
-		locationObjectId: locationObjectId
+		locationObjectId
 	};
 }
 
-export function isSelf(userObjectId: string) {
+export function isSelf(userObjectId: string): { _id: string } {
 	return {
 		_id: userObjectId
 	};
 }
 
-export function isCreatedBySelf(userObjectId: string) {
+export function isCreatedBySelf(userObjectId: string): { createdByUserObjectId: string } {
 	return {
 		createdByUserObjectId: userObjectId
 	};
 }
 
-export function hasRole(roles: string[]) {
+export function hasRole(roles: string[]): { role: { $in: string[] } } {
 	return {
 		role: { $in: roles }
 	};