brendan/project-inter-server
1
0
Fork 0
mirror of https://github.com/brendan-ch/project-inter-server.git synced 2026-04-19 08:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename historical parking query arguments to HistoricalParkingAverageFilterArguments

Browse Source
This commit is contained in:
Brendan Chen
2025-11-10 16:37:00 -08:00
parent c946647483
commit bd1ae07662
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/repositories/parking/InMemoryParkingRepository.ts
View File

@@ -1,9 +1,9 @@
import { ParkingGetterSetterRepository } from "./ParkingGetterSetterRepository"; import { ParkingGetterSetterRepository } from "./ParkingGetterSetterRepository";
import { import {
IParkingStructure, IParkingStructure,
IParkingStructureTimestampRecord IParkingStructureTimestampRecord
} from "../../entities/ParkingRepositoryEntities"; } from "../../entities/ParkingRepositoryEntities";
import { HistoricalParkingAverageQueryResult, HistoricalParkingAverageQueryArguments } from "./ParkingGetterRepository"; import { HistoricalParkingAverageQueryResult, HistoricalParkingAverageFilterArguments } from "./ParkingGetterRepository";
import { CircularQueue } from "../../types/CircularQueue"; import { CircularQueue } from "../../types/CircularQueue";
import { PARKING_LOGGING_INTERVAL_MS } from "../../environment"; import { PARKING_LOGGING_INTERVAL_MS } from "../../environment";
@@ -63,7 +63,7 @@ export class InMemoryParkingRepository implements ParkingGetterSetterRepository
return null; return null;
}; };
getHistoricalAveragesOfParkingStructureCounts = async (id: string, options: HistoricalParkingAverageQueryArguments): Promise<HistoricalParkingAverageQueryResult[]> => { getHistoricalAveragesOfParkingStructureCounts = async (id: string, options: HistoricalParkingAverageFilterArguments): Promise<HistoricalParkingAverageQueryResult[]> => {
const queue = this.historicalData.get(id); const queue = this.historicalData.get(id);
if (!queue || queue.size() === 0) { if (!queue || queue.size() === 0) {
return []; return [];
@@ -107,7 +107,7 @@ export class InMemoryParkingRepository implements ParkingGetterSetterRepository
private calculateAveragesFromRecords = ( private calculateAveragesFromRecords = (
records: IParkingStructureTimestampRecord[], records: IParkingStructureTimestampRecord[],
options: HistoricalParkingAverageQueryArguments options: HistoricalParkingAverageFilterArguments
): HistoricalParkingAverageQueryResult[] => { ): HistoricalParkingAverageQueryResult[] => {
const results: HistoricalParkingAverageQueryResult[] = []; const results: HistoricalParkingAverageQueryResult[] = [];
const { from, to, intervalMs } = options; const { from, to, intervalMs } = options;

4
src/repositories/parking/ParkingGetterRepository.ts
View File

@@ -1,6 +1,6 @@
import { IParkingStructure } from "../../entities/ParkingRepositoryEntities"; import { IParkingStructure } from "../../entities/ParkingRepositoryEntities";
export interface HistoricalParkingAverageQueryArguments { export interface HistoricalParkingAverageFilterArguments {
from: Date; from: Date;
to: Date; to: Date;
intervalMs: number; intervalMs: number;
@@ -22,5 +22,5 @@ export interface ParkingGetterRepository {
* @param id * @param id
* @param options * @param options
*/ */
getHistoricalAveragesOfParkingStructureCounts(id: string, options: HistoricalParkingAverageQueryArguments): Promise<HistoricalParkingAverageQueryResult[]>; getHistoricalAveragesOfParkingStructureCounts(id: string, options: HistoricalParkingAverageFilterArguments): Promise<HistoricalParkingAverageQueryResult[]>;
} }

6
src/repositories/parking/RedisParkingRepository.ts
View File

@@ -1,6 +1,6 @@
import { ParkingGetterSetterRepository } from "./ParkingGetterSetterRepository"; import { ParkingGetterSetterRepository } from "./ParkingGetterSetterRepository";
import { IParkingStructure } from "../../entities/ParkingRepositoryEntities"; import { IParkingStructure } from "../../entities/ParkingRepositoryEntities";
import { HistoricalParkingAverageQueryResult, HistoricalParkingAverageQueryArguments } from "./ParkingGetterRepository"; import { HistoricalParkingAverageQueryResult, HistoricalParkingAverageFilterArguments } from "./ParkingGetterRepository";
import { BaseRedisRepository } from "../BaseRedisRepository"; import { BaseRedisRepository } from "../BaseRedisRepository";
import { PARKING_LOGGING_INTERVAL_MS } from "../../environment"; import { PARKING_LOGGING_INTERVAL_MS } from "../../environment";
@@ -75,7 +75,7 @@ export class RedisParkingRepository extends BaseRedisRepository implements Parki
return null; return null;
}; };
getHistoricalAveragesOfParkingStructureCounts = async (id: string, options: HistoricalParkingAverageQueryArguments): Promise<HistoricalParkingAverageQueryResult[]> => { getHistoricalAveragesOfParkingStructureCounts = async (id: string, options: HistoricalParkingAverageFilterArguments): Promise<HistoricalParkingAverageQueryResult[]> => {
return this.calculateAveragesFromRecords(id, options); return this.calculateAveragesFromRecords(id, options);
}; };
@@ -157,7 +157,7 @@ export class RedisParkingRepository extends BaseRedisRepository implements Parki
private calculateAveragesFromRecords = async ( private calculateAveragesFromRecords = async (
id: string, id: string,
options: HistoricalParkingAverageQueryArguments options: HistoricalParkingAverageFilterArguments
): Promise<HistoricalParkingAverageQueryResult[]> => { ): Promise<HistoricalParkingAverageQueryResult[]> => {
const keys = this.createRedisKeys(id); const keys = this.createRedisKeys(id);
const { from, to, intervalMs } = options; const { from, to, intervalMs } = options;

6
src/repositories/parking/__tests__/ParkingRepositorySharedTests.test.ts
View File

@@ -1,9 +1,9 @@
import { afterEach, beforeEach, describe, expect, it, jest } from "@jest/globals"; import { afterEach, beforeEach, describe, expect, it, jest } from "@jest/globals";
import { InMemoryParkingRepository, } from "../InMemoryParkingRepository"; import { InMemoryParkingRepository, } from "../InMemoryParkingRepository";
import { IParkingStructure } from "../../../entities/ParkingRepositoryEntities"; import { IParkingStructure } from "../../../entities/ParkingRepositoryEntities";
import { HistoricalParkingAverageQueryArguments } from "../ParkingGetterRepository";
import { ParkingGetterSetterRepository } from "../ParkingGetterSetterRepository"; import { ParkingGetterSetterRepository } from "../ParkingGetterSetterRepository";
import { RedisParkingRepository } from "../RedisParkingRepository"; import { RedisParkingRepository } from "../RedisParkingRepository";
import { HistoricalParkingAverageFilterArguments } from "../ParkingGetterRepository";
interface RepositoryHolder { interface RepositoryHolder {
name: string; name: string;
@@ -151,7 +151,7 @@ describe.each(repositoryImplementations)('$name', (holder) => {
describe("getHistoricalAveragesOfParkingStructureCounts", () => { describe("getHistoricalAveragesOfParkingStructureCounts", () => {
it("should return empty array for non-existent structure or no data", async () => { it("should return empty array for non-existent structure or no data", async () => {
const options: HistoricalParkingAverageQueryArguments = { const options: HistoricalParkingAverageFilterArguments = {
from: new Date(1000), from: new Date(1000),
to: new Date(2000), to: new Date(2000),
intervalMs: 500 intervalMs: 500
@@ -182,7 +182,7 @@ describe.each(repositoryImplementations)('$name', (holder) => {
} }
const now = Date.now(); const now = Date.now();
const options: HistoricalParkingAverageQueryArguments = { const options: HistoricalParkingAverageFilterArguments = {
from: new Date(now - 10000), // Look back 10 seconds from: new Date(now - 10000), // Look back 10 seconds
to: new Date(now + 10000), // Look forward 10 seconds to: new Date(now + 10000), // Look forward 10 seconds
intervalMs: 20000 // Single large interval intervalMs: 20000 // Single large interval

8
src/resolvers/ParkingStructureResolvers.ts
View File

@@ -1,10 +1,10 @@
import { Resolvers } from "../generated/graphql"; import { Resolvers } from "../generated/graphql";
import { ServerContext } from "../ServerContext"; import { ServerContext } from "../ServerContext";
import { HistoricalParkingAverageQueryArguments } from "../repositories/parking/ParkingGetterRepository"; import { HistoricalParkingAverageFilterArguments } from "../repositories/parking/ParkingGetterRepository";
import { GraphQLError } from "graphql/error"; import { GraphQLError } from "graphql/error";
import { import {
PARKING_HISTORICAL_AVERAGE_MAXIMUM_TIMESPAN, PARKING_HISTORICAL_AVERAGE_MAXIMUM_TIMESPAN,
PARKING_HISTORICAL_AVERAGE_MINIMUM_INTERVAL PARKING_HISTORICAL_AVERAGE_MINIMUM_INTERVAL
} from "../environment"; } from "../environment";
export const ParkingStructureResolvers: Resolvers<ServerContext> = { export const ParkingStructureResolvers: Resolvers<ServerContext> = {
@@ -27,7 +27,7 @@ export const ParkingStructureResolvers: Resolvers<ServerContext> = {
throwBadUserInputError('No interval provided'); throwBadUserInputError('No interval provided');
return null; return null;
} }
const queryArguments: HistoricalParkingAverageQueryArguments = { const queryArguments: HistoricalParkingAverageFilterArguments = {
from: new Date(args.input.from), from: new Date(args.input.from),
intervalMs: args.input.intervalMs, intervalMs: args.input.intervalMs,
to: new Date(args.input.to), to: new Date(args.input.to),