Re-jigging some DTO definitions.

app/api/actions/curriculum-delivery-model.ts

@@ -3,7 +3,7 @@ import { ActionResponsePromise } from './actionResponse';
 import { WorkProjectSeriesSchemaDto } from '../dtos/WorkProjectSeriesSchemaDtoSchema';
 import { API_BASE_URL, Page } from '../main';
 import { GraphDto, GraphDtoPutRequestBody } from '../zod-mods';
-import { WorkSeriesBundleDeliveryDto } from '../dtos/WorkSeriesBundleDeliveryDtoSchema';
+import { WorkSeriesBundleAssignmentDto } from '../dtos/WorkSeriesBundleAssignmentDtoSchema';
 import { WorkSeriesSchemaBundleLeanDto } from '../dtos/WorkSeriesSchemaBundleLeanDtoSchema';
 import { OrganizationDto } from '../dtos/OrganizationDtoSchema';
 import {
@@ -16,6 +16,7 @@ import {
   putRequestWithDifferentReturnType
 } from './template-actions';
 import { OrganizationTypeDto } from '../dtos/OrganizationTypeDtoSchema';
+import { LongLongTuple } from '../dtos/LongLongTupleSchema';
 
 const SCHEMA_URL = `${API_BASE_URL}/workProjectSeriesSchemas`;
 
@@ -38,11 +39,11 @@ export async function deleteCurriculumDeliveryModels(schemaIdList: string[]) {
 }
 export async function getBundleDeliveriesByOrgType(
   orgType: string
-): ActionResponsePromise<WorkSeriesBundleDeliveryDto[]> {
+): ActionResponsePromise<WorkSeriesBundleAssignmentDto[]> {
   let url = SCHEMA_URL;
-  url = `${url}/deliveries/organizationType/${orgType.replaceAll(' ', '%20')}`;
+  url = `${url}/assignments/organizationType/${orgType.replaceAll(' ', '%20')}`;
 
-  return await getWithoutBody<WorkSeriesBundleDeliveryDto[]>(url);
+  return await getWithoutBody<WorkSeriesBundleAssignmentDto[]>(url);
 }
 
 export async function getSchemasByIdList(idList: string[]) {
@@ -84,8 +85,8 @@ export async function putOrganizationGraph(
 }
 export async function getCurriculumDeliveries(
   idList: number[]
-): ActionResponsePromise<WorkSeriesBundleDeliveryDto[]> {
-  const urlForDeliveries = `${SCHEMA_URL}/deliveries/by-party-id`;
+): ActionResponsePromise<WorkSeriesBundleAssignmentDto[]> {
+  const urlForDeliveries = `${SCHEMA_URL}/assignments/by-party-id`;
   return getDtoListByIds(idList, urlForDeliveries);
 }
 
@@ -124,18 +125,12 @@ export async function postModels(
 ): ActionResponsePromise<WorkProjectSeriesSchemaDto[]> {
   return postEntities(modelList, SCHEMA_URL);
 }
-
-export interface CreateBundleAssignmentDto {
-  partyId: number;
-  bundleId: number;
-}
-
 export async function postBundleDeliveries(
-  bundleAssignments: CreateBundleAssignmentDto[]
-): ActionResponsePromise<WorkSeriesBundleDeliveryDto[]> {
-  const bundlePostUrl = `${SCHEMA_URL}/deliveries`;
+  bundleAssignments: LongLongTuple[]
+): ActionResponsePromise<WorkSeriesBundleAssignmentDto[]> {
+  const bundlePostUrl = `${SCHEMA_URL}/assignments`;
   return postEntitiesWithDifferentReturnType<
-    CreateBundleAssignmentDto[],
-    WorkSeriesBundleDeliveryDto[]
+    LongLongTuple[],
+    WorkSeriesBundleAssignmentDto[]
   >(bundleAssignments, bundlePostUrl);
 }

app/api/dtos/LongLongTupleSchema.ts

@@ -0,0 +1,6 @@
+import { z } from 'zod';
+export const LongLongTupleSchema = z.object({
+  longOne: z.number(),
+  longTwo: z.number()
+});
+export type LongLongTuple = z.infer<typeof LongLongTupleSchema>;

app/api/dtos/ScheduleCellDTOSchema.ts

@@ -0,0 +1,7 @@
+import { z } from 'zod';
+export const ScheduleCellDTOSchema = z.object({
+  principalValue: z.string(),
+  leftBottom: z.string(),
+  rightBottom: z.string()
+});
+export type ScheduleCellDTO = z.infer<typeof ScheduleCellDTOSchema>;

app/api/dtos/WorkSeriesBundleAssignmentDtoSchema.ts

@@ -0,0 +1,10 @@
+import { WorkSeriesSchemaBundleLeanDtoSchema } from './WorkSeriesSchemaBundleLeanDtoSchema';
+import { z } from 'zod';
+export const WorkSeriesBundleAssignmentDtoSchema = z.object({
+  id: z.number(),
+  partyId: z.number(),
+  workSeriesSchemaBundle: WorkSeriesSchemaBundleLeanDtoSchema
+});
+export type WorkSeriesBundleAssignmentDto = z.infer<
+  typeof WorkSeriesBundleAssignmentDtoSchema
+>;

app/curriculum/delivery-models/contexts/bundle-assignments-provider.tsx

@@ -18,6 +18,7 @@ import {
   ConfirmActionModal,
   useModal
 } from '../../../generic/components/modals/confirm-action-modal';
+import { LongLongTuple } from '../../../api/dtos/LongLongTupleSchema';
 
 export function parseStringStringToIntInt(
   entry: [string, string]
@@ -56,12 +57,12 @@ export function BundleAssignmentsProvider({
 
   const handleConfirm = () => {
     const curriedMapper = (numberTuple: [number, number]) => {
-      return applyStringKeysToIntValues(['partyId', 'bundleId'], numberTuple);
+      return applyStringKeysToIntValues(['longOne', 'longTwo'], numberTuple);
     };
     const mappedBundles = Object.entries(bundleAssignmentState)
       .map(parseStringStringToIntInt)
       .map(curriedMapper);
-    const apiPayload = mappedBundles as { partyId: number; bundleId: number }[];
+    const apiPayload = mappedBundles as LongLongTuple[];
 
     postBundleDeliveries(apiPayload).then((r) => {
       if (r.status < 300 && r.data) {

app/curriculum/delivery-models/functions/map-to-party-id-bundle-id-records.ts

@@ -1,18 +1,18 @@
-import { WorkSeriesBundleDeliveryDto } from '../../../api/dtos/WorkSeriesBundleDeliveryDtoSchema';
+import { WorkSeriesBundleAssignmentDto } from '../../../api/dtos/WorkSeriesBundleAssignmentDtoSchema';
 import {
   StringMap,
   StringMapPayload
 } from '../../../contexts/string-map-context/string-map-reducer';
 
 export function mapToPartyIdBundleIdRecords(
-  bundles: WorkSeriesBundleDeliveryDto[]
+  bundles: WorkSeriesBundleAssignmentDto[]
 ) {
   const bundleAssignments = {} as StringMap<string>;
   const initialPayload = [] as StringMapPayload<string>[];
-  bundles.forEach((bundleDeliveryDto) => {
-    const partyIdString = bundleDeliveryDto.partyId.toString();
+  bundles.forEach((bundleAssignment) => {
+    const partyIdString = bundleAssignment.partyId.toString();
     const bundleIdString =
-      bundleDeliveryDto.workSeriesSchemaBundle.id.toString();
+      bundleAssignment.workSeriesSchemaBundle.id.toString();
     bundleAssignments[partyIdString] = bundleIdString;
     initialPayload.push({ key: partyIdString, data: bundleIdString });
   });

app/graphing/aggregate-functions/use-work-series-bundle-node-elements.tsx

@@ -2,13 +2,13 @@ import { WorkProjectSeriesSchemaDto } from '../../api/dtos/WorkProjectSeriesSche
 import React, { ReactElement } from 'react';
 import { DataNode } from '../../api/zod-mods';
 import { PartyDto } from '../../api/dtos/PartyDtoSchema';
-import { WorkSeriesBundleDeliveryDto } from '../../api/dtos/WorkSeriesBundleDeliveryDtoSchema';
+import { WorkSeriesBundleAssignmentDto } from '../../api/dtos/WorkSeriesBundleAssignmentDtoSchema';
 import { useCurriculumModelContext } from '../../curriculum/delivery-models/contexts/use-curriculum-model-context';
 import { NodeComponent } from '../nodes/node-component';
 
 export function useWorkSeriesBundleNodeElements(
   nodes: DataNode<PartyDto>[],
-  bundles: WorkSeriesBundleDeliveryDto[]
+  bundles: WorkSeriesBundleAssignmentDto[]
 ) {
   const { curriculumModelsMap } = useCurriculumModelContext();
   return nodes.map((d, index) => {

app/graphing/graph-types/organization/curriculum-delivery-graph.tsx

@@ -8,7 +8,7 @@ import React, { PropsWithChildren, useEffect, useMemo } from 'react';
 import { Card } from '@nextui-org/card';
 import CurriculumDeliveryDetails from './curriculum-delivery-details';
 import { NodePayload } from '../../force-graph-page';
-import { WorkSeriesBundleDeliveryDto } from '../../../api/dtos/WorkSeriesBundleDeliveryDtoSchema';
+import { WorkSeriesBundleAssignmentDto } from '../../../api/dtos/WorkSeriesBundleAssignmentDtoSchema';
 import { useBundleAssignmentsContext } from '../../../curriculum/delivery-models/contexts/use-bundle-assignments-context';
 import { OrganizationDto } from '../../../api/dtos/OrganizationDtoSchema';
 import { HasNumberIdDto } from '../../../api/dtos/HasNumberIdDtoSchema';
@@ -64,7 +64,7 @@ export const CurriculumDeliveryGraphPageKey = 'curriculum-delivery-graph-page';
 
 export default function CurriculumDeliveryGraph({
   bundles
-}: PropsWithChildren & { bundles: WorkSeriesBundleDeliveryDto[] }) {
+}: PropsWithChildren & { bundles: WorkSeriesBundleAssignmentDto[] }) {
   const { nodes, nodesRef, linksRef } = useNodeAndLinkRefs<OrganizationDto>();
 
   const { dispatch } = useBundleAssignmentsContext();

app/graphing/nodes/node-component-sky-hook.tsx

@@ -4,7 +4,7 @@ import { NodeComponentContext } from './node-component-context';
 import React, { PropsWithChildren } from 'react';
 import { PartyDto } from '../../api/dtos/PartyDtoSchema';
 import { DataNode } from '../../api/zod-mods';
-import { WorkSeriesBundleDeliveryDto } from '../../api/dtos/WorkSeriesBundleDeliveryDtoSchema';
+import { WorkSeriesBundleAssignmentDto } from '../../api/dtos/WorkSeriesBundleAssignmentDtoSchema';
 
 import { useWorkSeriesBundleNodeElements } from '../aggregate-functions/use-work-series-bundle-node-elements';
 
@@ -14,7 +14,7 @@ export default function NodeComponentSkyHook({
   bundles
 }: {
   nodes: DataNode<PartyDto>[];
-  bundles: WorkSeriesBundleDeliveryDto[];
+  bundles: WorkSeriesBundleAssignmentDto[];
 } & PropsWithChildren) {
   const workSeriesBundleNodeElements = useWorkSeriesBundleNodeElements(
     nodes,

app/timetables/timetable-period.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
-import { ScheduleCell } from '../api/dtos/ScheduleCellSchema';
+import { ScheduleCellDTO } from '../api/dtos/ScheduleCellDTOSchema';
 
 interface TimetablePeriodProps {
-  periodInfo: ScheduleCell;
+  periodInfo: ScheduleCellDTO;
 }
 
 function TimetablePeriod({ periodInfo }: TimetablePeriodProps) {