rename CommentedDateRange -> DateRange

ElectronicBabylonianLiterature · Feb 1, 2024 · 7b6657e · 7b6657e
1 parent 3544c36
commit 7b6657e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/src/fragmentarium/domain/archaeology.ts b/src/fragmentarium/domain/archaeology.ts
@@ -47,7 +47,7 @@ export class PartialDate {
       : `${Math.abs(this.year)} BCE`
   }
 }
-export type CommentedDateRange = {
+export type DateRange = {
   start: PartialDate
   end?: PartialDate | null
   notes?: string | null
@@ -72,7 +72,7 @@ export class Findspot {
     readonly building: string = '',
     readonly buildingType: BuildingType | null = null,
     readonly levelLayerPhase: string = '',
-    readonly dateRange: CommentedDateRange | null = null,
+    readonly dateRange: DateRange | null = null,
     readonly plans: readonly ExcavationPlan[] = [],
     readonly room: string = '',
     readonly context: string = '',
@@ -109,6 +109,7 @@ export interface Archaeology {
   readonly excavationNumber?: string
   readonly site?: ExcavationSite
   readonly isRegularExcavation?: boolean
+  readonly excavationDate?: DateRange | null
   readonly findspotId?: number | null
   readonly findspot?: Findspot | null
 }
diff --git a/src/fragmentarium/domain/archaeologyDtos.ts b/src/fragmentarium/domain/archaeologyDtos.ts
@@ -1,12 +1,7 @@
 import createReference from 'bibliography/application/createReference'
 import { ReferenceDto } from 'bibliography/domain/referenceDto'
 import _ from 'lodash'
-import {
-  Findspot,
-  ExcavationPlan,
-  PartialDate,
-  CommentedDateRange,
-} from './archaeology'
+import { Findspot, ExcavationPlan, PartialDate, DateRange } from './archaeology'
 import { Archaeology, excavationSites, SiteKey } from './archaeology'
 
 import MuseumNumber, { museumNumberToString } from './MuseumNumber'
@@ -91,7 +86,7 @@ function createPartialDate(dto): PartialDate {
   return new PartialDate(dto.year, dto.month, dto.day)
 }
 
-function fromDateRangeDto(dto: CommentedDateRangeDto): CommentedDateRange {
+function fromDateRangeDto(dto: CommentedDateRangeDto): DateRange {
   return {
     ...dto,
     start: createPartialDate(dto.start),

diff --git a/src/test-support/fragment-fixtures.ts b/src/test-support/fragment-fixtures.ts
@@ -25,7 +25,7 @@ import { MesopotamianDate } from 'chronology/domain/Date'
 import { mesopotamianDateFactory } from './date-fixtures'
 import {
   Archaeology,
-  CommentedDateRange,
+  DateRange,
   ExcavationPlan,
   Findspot,
   PartialDate,
@@ -185,7 +185,7 @@ const partialDateFactory = Factory.define<PartialDate>(
   }
 )
 
-export const dateRangeFactory = Factory.define<CommentedDateRange>(
+export const dateRangeFactory = Factory.define<DateRange>(
   ({ transientParams }) => {
     const chance = transientParams.chance ?? defaultChance
     return {