Removing commented code

nationalarchives · Jan 4, 2024 · 4e01600 · 4e01600
1 parent 32d85f4
commit 4e01600
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 23 deletions.
diff --git a/src/main/scala/uk/gov/nationalarchives/tdr/api/graphql/fields/ConsignmentFields.scala b/src/main/scala/uk/gov/nationalarchives/tdr/api/graphql/fields/ConsignmentFields.scala
@@ -67,8 +67,6 @@ object ConsignmentFields {
 
   case class FileChecks(antivirusProgress: AntivirusProgress, checksumProgress: ChecksumProgress, ffidProgress: FFIDProgress)
 
-  // case class TransferringBody(name: String, tdrCode: String)
-
   case class StartUploadInput(consignmentId: UUID, parentFolder: String, includeTopLevelFolder: Boolean = false) extends UserOwnsConsignment
 
   case class UpdateExportDataInput(consignmentId: UUID, exportLocation: String, exportDatetime: Option[ZonedDateTime], exportVersion: String)
@@ -87,8 +85,6 @@ object ConsignmentFields {
     deriveObjectType[Unit, ChecksumProgress]()
   implicit val FfidProgressType: ObjectType[Unit, FFIDProgress] =
     deriveObjectType[Unit, FFIDProgress]()
-  // implicit val TransferringBodyType: ObjectType[Unit, TransferringBody] =
-  //  deriveObjectType[Unit, TransferringBody]()
   implicit val FileMetadataValueType: ObjectType[Unit, FileMetadataValue] =
     deriveObjectType[Unit, FileMetadataValue]()
   implicit val FileType: ObjectType[Unit, File] =
@@ -222,7 +218,6 @@ object ConsignmentFields {
   val ConsignmentIdArg: Argument[UUID] = Argument("consignmentid", UuidType)
   val ExportDataArg: Argument[UpdateExportDataInput] = Argument("exportData", UpdateExportDataInputType)
   val LimitArg: Argument[Int] = Argument("limit", IntType)
-  // val UserIdArg: Argument[Option[UUID]] = Argument("userId", OptionInputType(UuidType))
   val CurrentCursorArg: Argument[Option[String]] = Argument("currentCursor", OptionInputType(StringType))
   val CurrentPageArg: Argument[Option[Int]] = Argument("currentPage", OptionInputType(IntType))
   val StartUploadArg: Argument[StartUploadInput] = Argument("startUploadInput", StartUploadInputType)

diff --git a/src/main/scala/uk/gov/nationalarchives/tdr/api/service/ConsignmentService.scala b/src/main/scala/uk/gov/nationalarchives/tdr/api/service/ConsignmentService.scala
@@ -125,13 +125,6 @@ class ConsignmentService(
     } yield result
   }
 
-  /*
-  def getTransferringBodyOfConsignment(consignmentId: UUID): Future[Option[TransferringBody]] = {
-    val consignment: Future[Seq[BodyRow]] = consignmentRepository.getTransferringBodyOfConsignment(consignmentId)
-    consignment.map(rows => rows.headOption.map(transferringBody => TransferringBody(transferringBody.name, transferringBody.tdrcode)))
-  }
-   */
-
   def consignmentHasFiles(consignmentId: UUID): Future[Boolean] = {
     consignmentRepository.consignmentHasFiles(consignmentId)
   }

diff --git a/src/test/scala/uk/gov/nationalarchives/tdr/api/routes/ConsignmentRouteSpec.scala b/src/test/scala/uk/gov/nationalarchives/tdr/api/routes/ConsignmentRouteSpec.scala
@@ -61,7 +61,6 @@ class ConsignmentRouteSpec extends TestContainerUtils with Matchers with TestReq
       totalFiles: Option[Int],
       fileChecks: Option[FileChecks],
       parentFolder: Option[String],
-      // transferringBody: Option[TransferringBody],
       files: Option[List[File]],
       paginatedFiles: Option[FileConnections],
       consignmentType: Option[String],

diff --git a/src/test/scala/uk/gov/nationalarchives/tdr/api/service/ConsignmentServiceSpec.scala b/src/test/scala/uk/gov/nationalarchives/tdr/api/service/ConsignmentServiceSpec.scala
@@ -346,16 +346,6 @@ class ConsignmentServiceSpec extends AnyFlatSpec with MockitoSugar with ResetMoc
     result should equal(expectedResult)
   }
 
-  /*
-  "getTransferringBodyOfConsignment" should "return the transferring body for a given consignment" in {
-    val mockBody = Seq(BodyRow(bodyId, bodyName, bodyDescription, bodyCode))
-    when(consignmentRepoMock.getTransferringBodyOfConsignment(consignmentId)).thenReturn(Future.successful(mockBody))
-
-    val body: ConsignmentFields.TransferringBody = consignmentService.getTransferringBodyOfConsignment(consignmentId).futureValue.get
-    body.name shouldBe mockBody.head.name
-  }
-   */
-
   "getConsignments" should "return all the consignments after the cursor to the limit" in {
     val consignmentId2 = UUID.fromString("fa19cd46-216f-497a-8c1d-6caaf3f421bc")
     val consignmentId3 = UUID.fromString("614d0cba-380f-4b09-a6e4-542413dd7f4a")