Changes: Move to generated DAO

apicollective · Aug 2, 2024 · ceccf44 · ceccf44
1 parent afa0e74
commit ceccf44
Show file tree

Hide file tree

Showing 15 changed files with 1,011 additions and 259 deletions.
diff --git a/api/app/controllers/Changes.scala b/api/app/controllers/Changes.scala
@@ -1,15 +1,18 @@
 package controllers
 
-import io.apibuilder.api.v0.models.json._
-import db.ChangesDao
+import io.apibuilder.api.v0.models.json.*
+import db.InternalChangesDao
+import models.ChangesModel
+
 import javax.inject.{Inject, Singleton}
-import play.api.mvc._
-import play.api.libs.json._
+import play.api.mvc.*
+import play.api.libs.json.*
 
 @Singleton
 class Changes @Inject() (
   val apiBuilderControllerComponents: ApiBuilderControllerComponents,
-  changesDao: ChangesDao
+  changesDao: InternalChangesDao,
+  model: ChangesModel
 ) extends ApiBuilderController {
 
   def get(
@@ -28,10 +31,10 @@ class Changes @Inject() (
       fromVersion = from,
       toVersion = to,
       `type` = `type`,
-      limit = limit,
+      limit = Some(limit),
       offset = offset
     )
-    Ok(Json.toJson(changes))
+    Ok(Json.toJson(model.toModels(changes)))
   }
 
 }
diff --git a/api/app/controllers/Versions.scala b/api/app/controllers/Versions.scala
@@ -32,7 +32,7 @@ class Versions @Inject() (
       versionsDao.findAll(
         request.authorization,
         applicationGuid = Some(application.guid),
-        limit = limit,
+        limit = Some(limit),
         offset = offset
       )
     }.getOrElse(Nil)

diff --git a/api/app/db/ChangesDao.scala b/api/app/db/ChangesDao.scala
diff --git a/api/app/db/InternalApplicationsDao.scala b/api/app/db/InternalApplicationsDao.scala
@@ -228,6 +228,10 @@ class InternalApplicationsDao @Inject()(
     findAll(authorization, guid = Some(guid), limit = Some(1)).headOption
   }
 
+  def findAllByGuids(authorization: Authorization, guids: Seq[UUID]): Seq[InternalApplication] = {
+    findAll(authorization, guids = Some(guids), limit = None)
+  }
+
   def findAll(
     authorization: Authorization,
     orgKey: Option[String] = None,