CenterForDigitalHumanities
diff --git a/‎app.js‎
Lines changed: 1 addition & 1 deletion b/‎app.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎classes/Layer/Layer.js‎
Lines changed: 1 addition & 1 deletion b/‎classes/Layer/Layer.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎classes/Line/Line.js‎
Lines changed: 29 additions & 15 deletions b/‎classes/Line/Line.js‎
Lines changed: 29 additions & 15 deletions
diff --git a/‎classes/Line/__tests__/Line.test.js‎
Lines changed: 73 additions & 0 deletions b/‎classes/Line/__tests__/Line.test.js‎
Lines changed: 73 additions & 0 deletions
diff --git a/‎classes/Page/Page.js‎
Lines changed: 11 additions & 9 deletions b/‎classes/Page/Page.js‎
Lines changed: 11 additions & 9 deletions
diff --git a/‎database/driver.js‎
Lines changed: 13 additions & 0 deletions b/‎database/driver.js‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎line/__tests__/end_to_end_unit.test.js‎
Lines changed: 0 additions & 52 deletions b/‎line/__tests__/end_to_end_unit.test.js‎
Lines changed: 0 additions & 52 deletions
diff --git a/‎line/__tests__/exists_unit.test.js‎
Lines changed: 0 additions & 15 deletions b/‎line/__tests__/exists_unit.test.js‎
Lines changed: 0 additions & 15 deletions
@@ -60,8 +60,8 @@ app.all('*', (req, res, next) => {
 
 app.use('/', indexRouter)
 app.use('/manifest', manifestRouter)
+app.use('/project/:projectId/page/:pageId/line', lineRouter) 
 app.use('/project', projectRouter)
-app.use('/line', lineRouter) 
 app.use('/user', userProfileRouter)
 app.use('/my',  privateProfileRouter) 
 app.use('/proxy', proxyRouter)
 
@@ -59,7 +59,7 @@ export default class Layer {
 
     // Public Methods
     async delete() {
-        if (this.#tinyAction === 'delete') {
+        if (this.#tinyAction === 'update') {
             await Promise.all(this.pages.map(page => {
                 const p = new Page(this.id, page)
                 return p.delete()
 
@@ -4,14 +4,14 @@ const databaseTiny = new dbDriver("tiny")
 export default class Line {
 
     #tinyAction = 'create'
-    #setRerumId() {
-        if (this.#tinyAction === 'create') {
-            this.id = `${process.env.RERUMIDPREFIX}${id.split("/").pop()}`
+    #setRerumId(force) {
+        if (force || this.#tinyAction === 'create') {
+            this.id = `${process.env.RERUMIDPREFIX}${this.id.split("/").pop()}`
         }
         return this
     }
 
-    constructor({ id, target, body }) {
+    constructor({ id, target, body, motivation, label, type }) {
         if (!id || !body || !target) {
             throw new Error('Line data is malformed.')
         }
@@ -21,19 +21,23 @@ export default class Line {
         if (id.startsWith?.(process.env.RERUMIDPREFIX)) {
             this.#tinyAction = 'update'
         }
+        if (motivation) this.motivation = motivation
+        if (label) this.label = label
+        if (type) this.type = type
         return this
     }
 
-    static build(projectId, pageId, { id, body, target }) {
-        id ??= `${process.env.SERVERURL}/project/${projectId}/page/${pageId}/line/${databaseTiny.reserveId()}`
-        return new Line({ id, body, target })
+    static build(projectId, pageId, { body, target, motivation, label, type }) {
+        // TODO: Should this have a space for an id that is sent in?
+        const id = `${process.env.SERVERURL}project/${projectId}/page/${pageId}/line/${databaseTiny.reserveId()}`
+        return new Line({ id, body, target, motivation, label, type })
     }
 
     async #saveLineToRerum() {
         const lineAsAnnotation = {
             "@context": "http://iiif.io/api/presentation/3/context.json",
             id: this.id,
-            type: "Annotation",
+            type: this.type ?? "Annotation",
             motivation: this.motivation ?? "transcribing",
             target: this.target,
             body: this.body
@@ -49,11 +53,21 @@ export default class Line {
         }
         // ...else Update the existing page in RERUM
         const existingLine = await fetch(this.id).then(res => res.json())
+        .catch(err => {
+            if (err.status === 404) {
+                // If the line doesn't exist, we can create it
+                return null
+            }
+            throw new Error(`Failed to fetch existing Line from RERUM: ${err.message}`)
+        })
+
         if (!existingLine) {
-            throw new Error(`Failed to find Line in RERUM: ${this.id}`)
+            // This id doesn't exist in RERUM, so we need to create it
+            this.#tinyAction = 'create'
         }
-        const updatedLine = { ...existingLine, ...lineAsAnnotation }
-        const newURI = await databaseTiny.update(updatedLine).then(res => res.headers.get('location')).catch(err => {
+        const updatedLine = existingLine ? { ...existingLine, ...lineAsAnnotation } : lineAsAnnotation
+        const newURI = await databaseTiny[this.#tinyAction](updatedLine).then(res => res.id)
+        .catch(err => {
             throw new Error(`Failed to update Line in RERUM: ${err.message}`)
         })
         this.id = newURI
@@ -65,17 +79,17 @@ export default class Line {
      * @returns {Promise} Resolves to the updated Layer object as stored in Project.
      */
    async update() {
-    if (this.#tinyAction === 'update' || typeof this.body !== 'string') {
-        await this.#setRerumId().#saveLineToRerum()
+    if (this.#tinyAction === 'update' || this.body) {
+        this.#setRerumId(true)
+        await this.#saveLineToRerum()
     }
     return this.#updateLineForPage()
 }
 
 async #updateLineForPage() {
     return {
         id: this.id,
-        target: this.target,
-        body: this.body,
+        target: this.target
     }
 }
     async updateText(text) {
 
@@ -0,0 +1,73 @@
+import Line from '../Line.js'
+
+describe.skip('Line class unit tests', () => {
+  it('should throw an error if no ID, body, or target is provided', () => {
+    expect(() => new Line({})).toThrow('Line data is malformed.')
+  })
+
+  it('should create a new Line instance with valid data', () => {
+    const line = new Line({ id: '123', body: 'Sample text', target: 'https://example.com?xywh=10,10,100,100' })
+    expect(line.id).toBe('123')
+    expect(line.body).toBe('Sample text')
+    expect(line.target).toBe('https://example.com?xywh=10,10,100,100')
+  })
+
+  it('should save a line to RERUM', async () => {
+    const line = new Line({ id: '123', body: 'Sample text', target: 'https://example.com?xywh=10,10,100,100' })
+    const savedLine = await line.update()
+    expect(savedLine.id).toBeDefined()
+  })
+
+  it('should update the text of a line', async () => {
+    const line = new Line({ id: '123', body: 'Old text', target: 'https://example.com?xywh=10,10,100,100' })
+    const updatedLine = await line.updateText('New text')
+    expect(updatedLine.body).toBe('New text')
+  })
+
+  it('should not update the text if it is the same', async () => {
+    const line = new Line({ id: '123', body: 'Same text', target: 'https://example.com?xywh=10,10,100,100' })
+    const updatedLine = await line.updateText('Same text')
+    expect(updatedLine.body).toBe('Same text')
+  })
+
+  it('should update the bounds of a line', async () => {
+    const line = new Line({ id: '123', body: 'Sample text', target: 'https://example.com?xywh=10,10,100,100' })
+    const updatedLine = await line.updateBounds({ x: 20, y: 20, w: 200, h: 200 })
+    expect(updatedLine.target).toBe('https://example.com?xywh=20,20,200,200')
+  })
+
+  it('should not update the bounds if they are the same', async () => {
+    const line = new Line({ id: '123', body: 'Sample text', target: 'https://example.com?xywh=10,10,100,100' })
+    const updatedLine = await line.updateBounds({ x: 10, y: 10, w: 100, h: 100 })
+    expect(updatedLine.target).toBe('https://example.com?xywh=10,10,100,100')
+  })
+
+  it('should return JSON-LD format when isLD is true', () => {
+    const line = new Line({ id: '123', body: 'Sample text', target: 'https://example.com?xywh=10,10,100,100' })
+    const jsonLD = line.asJSON(true)
+    expect(jsonLD).toEqual({
+      '@context': 'http://iiif.io/api/presentation/3/context.json',
+      id: '123',
+      type: 'Annotation',
+      motivation: 'transcribing',
+      target: 'https://example.com?xywh=10,10,100,100',
+      body: 'Sample text'
+    })
+  })
+
+  it('should return plain JSON format when isLD is false', () => {
+    const line = new Line({ id: '123', body: 'Sample text', target: 'https://example.com?xywh=10,10,100,100' })
+    const json = line.asJSON(false)
+    expect(json).toEqual({
+        id: '123',
+      body: 'Sample text',
+      target: 'https://example.com?xywh=10,10,100,100'
+    })
+  })
+
+  it('should delete a line', async () => {
+    const line = new Line({ id: '123', body: 'Sample text', target: 'https://example.com?xywh=10,10,100,100' })
+    const result = await line.delete()
+    expect(result).toBe(true)
+  })
+})
@@ -7,7 +7,7 @@ export default class Page {
     #tinyAction = 'create'
     #setRerumId() {
         if (this.#tinyAction === 'create') {
-            this.id = `${process.env.RERUMIDPREFIX}${id.split("/").pop()}`
+            this.id = `${process.env.RERUMIDPREFIX}${this.id.split("/").pop()}`
         }
         return this
     }
@@ -22,18 +22,18 @@ export default class Page {
      * @param {String} target The uri of the targeted Canvas.
      * @seeAlso {@link Page.build}
      */
-    constructor(layerId, { id, label, target }) {
+    constructor(layerId, { id, label, target, items = [] }) {
         if (!id || !target) {
             throw new Error("Page data is malformed.")
         }
-        Object.assign(this, { id, label, target, partOf: layerId })
+        Object.assign(this, { id, label, target, partOf: layerId, items })
         if (this.id.startsWith(process.env.RERUMIDPREFIX)) {
             this.#tinyAction = 'update'
         }
         return this
     }
 
-    static build(projectId, layerId, canvas, prev, next, lines = []) {
+    static build(projectId, layerId, canvas, prev, next, items = []) {
         if (!projectId) {
             throw new Error("Project ID is required to create a Page instance.")
         }
@@ -47,7 +47,7 @@ export default class Page {
             canvas = {id : canvas}
         }
 
-        const id = lines.length
+        const id = items.length
             ? `${process.env.RERUMIDPREFIX}${databaseTiny.reserveId()}`
             : `${process.env.SERVERURL}project/${projectId}/page/${databaseTiny.reserveId()}`
 
@@ -59,7 +59,7 @@ export default class Page {
                 label: canvas.label ?? `Page ${canvas.id.split('/').pop()}`,
                 target: canvas.id,
                 partOf: layerId,
-                items: lines,
+                items,
                 prev,
                 next
             }
@@ -76,7 +76,7 @@ export default class Page {
             label: { "none": [this.label] },
             target: this.target,
             partOf: this.partOf,
-            items: this.data.items ?? [],
+            items: this.items ?? [],
             prev: this.prev ?? null,
             next: this.next ?? null
         }
@@ -105,7 +105,8 @@ export default class Page {
      */
     async update() {
         if (this.#tinyAction === 'update' || this.items.length) {
-            await this.#setRerumId().#savePageToRerum()
+            this.#setRerumId()
+            await this.#savePageToRerum()
         }
         return this.#updatePageForProject()
     }
@@ -124,7 +125,8 @@ export default class Page {
         return {
             id: this.id,
             label: this.label,
-            target: this.target
+            target: this.target,
+            items: this.items ?? []
         }
     }
 
 
@@ -118,6 +118,19 @@ class dbDriver {
         return this.controller.remove(data, collection)
     }
 
+    /**
+     * Overwrite an existing object in the database
+     * @param data JSON from an HTTP POST request. It must contain an id.
+     * @param collection Optional collection override
+     * @return The updated document JSON or error JSON
+     */
+    async overwrite(data, collection) {
+        data._modifiedAt = new Date()
+        collection ??= resolveCollection(data)
+        if (!collection) throw new Error("Cannot determine collection for overwrite operation")
+        return this.controller.overwrite(data, collection)
+    }
+
     /**
      * Get data from the database that have matching property values.
      * @param query JSON from an HTTP POST request. It must contain at least one property.
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ export default class Page {`
`7`	`7`	`#tinyAction = 'create'`
`8`	`8`	`#setRerumId() {`
`9`	`9`	`if (this.#tinyAction === 'create') {`
`10`		- this.id = `${process.env.RERUMIDPREFIX}${id.split("/").pop()}`
	`10`	+ this.id = `${process.env.RERUMIDPREFIX}${this.id.split("/").pop()}`
`11`	`11`	`}`
`12`	`12`	`return this`
`13`	`13`	`}`
`@@ -22,18 +22,18 @@ export default class Page {`
`22`	`22`	`* @param {String} target The uri of the targeted Canvas.`
`23`	`23`	`* @seeAlso {@link Page.build}`
`24`	`24`	`*/`
`25`		`- constructor(layerId, { id, label, target }) {`
	`25`	`+ constructor(layerId, { id, label, target, items = [] }) {`
`26`	`26`	`if (!id \|\| !target) {`
`27`	`27`	`throw new Error("Page data is malformed.")`
`28`	`28`	`}`
`29`		`- Object.assign(this, { id, label, target, partOf: layerId })`
	`29`	`+ Object.assign(this, { id, label, target, partOf: layerId, items })`
`30`	`30`	`if (this.id.startsWith(process.env.RERUMIDPREFIX)) {`
`31`	`31`	`this.#tinyAction = 'update'`
`32`	`32`	`}`
`33`	`33`	`return this`
`34`	`34`	`}`
`35`	`35`
`36`		`- static build(projectId, layerId, canvas, prev, next, lines = []) {`
	`36`	`+ static build(projectId, layerId, canvas, prev, next, items = []) {`
`37`	`37`	`if (!projectId) {`
`38`	`38`	`throw new Error("Project ID is required to create a Page instance.")`
`39`	`39`	`}`
`@@ -47,7 +47,7 @@ export default class Page {`
`47`	`47`	`canvas = {id : canvas}`
`48`	`48`	`}`
`49`	`49`
`50`		`- const id = lines.length`
	`50`	`+ const id = items.length`
`51`	`51`	? `${process.env.RERUMIDPREFIX}${databaseTiny.reserveId()}`
`52`	`52`	: `${process.env.SERVERURL}project/${projectId}/page/${databaseTiny.reserveId()}`
`53`	`53`
`@@ -59,7 +59,7 @@ export default class Page {`
`59`	`59`	label: canvas.label ?? `Page ${canvas.id.split('/').pop()}`,
`60`	`60`	`target: canvas.id,`
`61`	`61`	`partOf: layerId,`
`62`		`- items: lines,`
	`62`	`+ items,`
`63`	`63`	`prev,`
`64`	`64`	`next`
`65`	`65`	`}`
`@@ -76,7 +76,7 @@ export default class Page {`
`76`	`76`	`label: { "none": [this.label] },`
`77`	`77`	`target: this.target,`
`78`	`78`	`partOf: this.partOf,`
`79`		`- items: this.data.items ?? [],`
	`79`	`+ items: this.items ?? [],`
`80`	`80`	`prev: this.prev ?? null,`
`81`	`81`	`next: this.next ?? null`
`82`	`82`	`}`
`@@ -105,7 +105,8 @@ export default class Page {`
`105`	`105`	`*/`
`106`	`106`	`async update() {`
`107`	`107`	`if (this.#tinyAction === 'update' \|\| this.items.length) {`
`108`		`- await this.#setRerumId().#savePageToRerum()`
	`108`	`+ this.#setRerumId()`
	`109`	`+ await this.#savePageToRerum()`
`109`	`110`	`}`
`110`	`111`	`return this.#updatePageForProject()`
`111`	`112`	`}`
`@@ -124,7 +125,8 @@ export default class Page {`
`124`	`125`	`return {`
`125`	`126`	`id: this.id,`
`126`	`127`	`label: this.label,`
`127`		`- target: this.target`
	`128`	`+ target: this.target,`
	`129`	`+ items: this.items ?? []`
`128`	`130`	`}`
`129`	`131`	`}`
`130`	`132`