Added "text" and "format" fields to Content table and related classes (…

…#396)
WycliffeAssociates · Feb 1, 2019 · 35c028f · 35c028f
1 parent c531d56
commit 35c028f
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 7 deletions.
diff --git a/src/main/kotlin/org/wycliffeassociates/otter/jvm/persistence/database/daos/ContentDao.kt b/src/main/kotlin/org/wycliffeassociates/otter/jvm/persistence/database/daos/ContentDao.kt
@@ -68,14 +68,18 @@ class ContentDao(
                         CONTENT_ENTITY.SORT,
                         CONTENT_ENTITY.START,
                         CONTENT_ENTITY.LABEL,
-                        CONTENT_ENTITY.SELECTED_TAKE_FK
+                        CONTENT_ENTITY.SELECTED_TAKE_FK,
+                        CONTENT_ENTITY.TEXT,
+                        CONTENT_ENTITY.FORMAT
                 )
                 .values(
                         entity.collectionFk,
                         entity.sort,
                         entity.start,
                         entity.labelKey,
-                        entity.selectedTakeFk
+                        entity.selectedTakeFk,
+                        entity.text,
+                        entity.format
                 )
                 .execute()
 
@@ -115,6 +119,8 @@ class ContentDao(
                 .set(CONTENT_ENTITY.START, entity.start)
                 .set(CONTENT_ENTITY.COLLECTION_FK, entity.collectionFk)
                 .set(CONTENT_ENTITY.SELECTED_TAKE_FK, entity.selectedTakeFk)
+                .set(CONTENT_ENTITY.TEXT, entity.text)
+                .set(CONTENT_ENTITY.FORMAT, entity.format)
                 .where(CONTENT_ENTITY.ID.eq(entity.id))
                 .execute()
     }

diff --git a/src/main/kotlin/org/wycliffeassociates/otter/jvm/persistence/database/daos/RecordMappers.kt b/src/main/kotlin/org/wycliffeassociates/otter/jvm/persistence/database/daos/RecordMappers.kt
@@ -65,7 +65,9 @@ class RecordMappers {
                     record.getValue(CONTENT_ENTITY.LABEL),
                     record.getValue(CONTENT_ENTITY.START),
                     record.getValue(CONTENT_ENTITY.COLLECTION_FK),
-                    record.getValue(CONTENT_ENTITY.SELECTED_TAKE_FK)
+                    record.getValue(CONTENT_ENTITY.SELECTED_TAKE_FK),
+                    record.getValue(CONTENT_ENTITY.TEXT),
+                    record.getValue(CONTENT_ENTITY.FORMAT)
             )
         }
 

diff --git a/src/main/kotlin/org/wycliffeassociates/otter/jvm/persistence/entities/ContentEntity.kt b/src/main/kotlin/org/wycliffeassociates/otter/jvm/persistence/entities/ContentEntity.kt
@@ -6,5 +6,7 @@ data class ContentEntity(
         var labelKey: String,
         var start: Int,
         var collectionFk: Int,
-        var selectedTakeFk: Int?
+        var selectedTakeFk: Int?,
+        var text: String?,
+        var format: String?
 )
diff --git a/...kotlin/org/wycliffeassociates/otter/jvm/persistence/repositories/mapping/ContentMapper.kt b/...kotlin/org/wycliffeassociates/otter/jvm/persistence/repositories/mapping/ContentMapper.kt
@@ -12,6 +12,8 @@ class ContentMapper {
                 entity.start,
                 end,
                 selectedTake,
+                entity.text,
+                entity.format,
                 entity.id
         )
     }
@@ -23,7 +25,9 @@ class ContentMapper {
                 obj.labelKey,
                 obj.start,
                 collectionFk,
-                obj.selectedTake?.id
+                obj.selectedTake?.id,
+                obj.text,
+                obj.format
         )
     }
 

diff --git a/src/main/resources/sql/CreateAppDb.sql b/src/main/resources/sql/CreateAppDb.sql
@@ -52,7 +52,9 @@ CREATE TABLE IF NOT EXISTS content_entity (
     label            TEXT NOT NULL,
     selected_take_fk INTEGER REFERENCES take_entity(id),
     start            INTEGER NOT NULL,
-    sort             INTEGER NOT NULL
+    sort             INTEGER NOT NULL,
+    text             TEXT,
+    format           TEXT
 );
 
 CREATE TABLE IF NOT EXISTS content_derivative (

diff --git a/src/test/kotlin/org/wycliffeassociates/otter/jvm/persistence/TestDataStore.kt b/src/test/kotlin/org/wycliffeassociates/otter/jvm/persistence/TestDataStore.kt
@@ -120,14 +120,18 @@ object TestDataStore {
                     "verse1",
                     1,
                     1,
+                    null,
+                    null,
                     null
             ),
             Content(
                     41,
                     "verse42",
                     42,
                     42,
-                    takes.first()
+                    takes.first(),
+                    null,
+                    null
             )
     )
 }