From 0c52ea1d17340e7f8713b680cbb36b6c8b9dd97b Mon Sep 17 00:00:00 2001
From: To-om <toom@thehive-project.org>
Date: Wed, 3 Feb 2021 16:06:25 +0100
Subject: [PATCH] #1758 Make MISP organisation description optional

---
 .../scala/org/thp/misp/dto/Organisation.scala   |  2 +-
 .../misp/services/MispImportSrvTest.scala       | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/misp/client/src/main/scala/org/thp/misp/dto/Organisation.scala b/misp/client/src/main/scala/org/thp/misp/dto/Organisation.scala
index 1552d83b01..f8a6486110 100644
--- a/misp/client/src/main/scala/org/thp/misp/dto/Organisation.scala
+++ b/misp/client/src/main/scala/org/thp/misp/dto/Organisation.scala
@@ -4,7 +4,7 @@ import java.util.UUID
 
 import play.api.libs.json.{Json, Reads}
 
-case class Organisation(id: String, name: String, description: String, uuid: UUID)
+case class Organisation(id: String, name: String, description: Option[String], uuid: UUID)
 
 object Organisation {
   implicit val reads: Reads[Organisation] = Json.reads[Organisation]
diff --git a/misp/connector/src/test/scala/org/thp/thehive/connector/misp/services/MispImportSrvTest.scala b/misp/connector/src/test/scala/org/thp/thehive/connector/misp/services/MispImportSrvTest.scala
index 97042b73c9..46d2746f1c 100644
--- a/misp/connector/src/test/scala/org/thp/thehive/connector/misp/services/MispImportSrvTest.scala
+++ b/misp/connector/src/test/scala/org/thp/thehive/connector/misp/services/MispImportSrvTest.scala
@@ -1,24 +1,17 @@
 package org.thp.thehive.connector.misp.services
 
-import java.util.{Date, UUID}
-
 import akka.stream.Materializer
 import akka.stream.scaladsl.Sink
 import org.thp.misp.dto.{Event, Organisation, Tag, User}
+import org.thp.scalligraph.AppBuilder
 import org.thp.scalligraph.auth.AuthContext
-import org.thp.scalligraph.models.{Database, DummyUserSrv}
-import org.thp.scalligraph.traversal.TraversalOps._
-import org.thp.scalligraph.{AppBuilder, EntityName}
+import org.thp.scalligraph.models.DummyUserSrv
 import org.thp.thehive.TestAppBuilder
-import org.thp.thehive.models.{Alert, Permissions}
-import org.thp.thehive.services.AlertOps._
-import org.thp.thehive.services.ObservableOps._
-import org.thp.thehive.services.OrganisationOps._
-import org.thp.thehive.services.{AlertSrv, OrganisationSrv}
+import org.thp.thehive.models.Permissions
 import play.api.test.PlaySpecification
 
+import java.util.{Date, UUID}
 import scala.concurrent.ExecutionContext
-import scala.concurrent.duration.DurationInt
 
 class MispImportSrvTest(implicit ec: ExecutionContext) extends PlaySpecification with TestAppBuilder {
   sequential
@@ -37,7 +30,7 @@ class MispImportSrvTest(implicit ec: ExecutionContext) extends PlaySpecification
 
     "get organisation" in testApp { app =>
       await(app[TheHiveMispClient].getOrganisation("1")) must beEqualTo(
-        Organisation("1", "ORGNAME", "Automatically generated admin organisation", UUID.fromString("5d5d066f-cfa4-49da-995c-6d5b68257ab4"))
+        Organisation("1", "ORGNAME", Some("Automatically generated admin organisation"), UUID.fromString("5d5d066f-cfa4-49da-995c-6d5b68257ab4"))
       )
     }