From b4679b4d2d7971294de70bc358cabe1c20bb9109 Mon Sep 17 00:00:00 2001
From: Alexis Hernandez <alexis22229@gmail.com>
Date: Sat, 24 Feb 2018 15:11:45 -0600
Subject: [PATCH] alerts-server: Move ErrorId to commons package

---
 .../coinalerts/commons/AbstractJsonController.scala      | 2 +-
 .../app/com/alexitc/coinalerts/commons/ErrorId.scala     | 9 +++++++++
 .../alexitc/coinalerts/commons/PublicErrorRenderer.scala | 1 -
 .../app/com/alexitc/coinalerts/core/ErrorId.scala        | 6 ------
 .../com/alexitc/coinalerts/errors/PlayErrorHandler.scala | 3 +--
 alerts-server/app/controllers/MyJsonController.scala     | 3 +--
 .../commons/examples/CustomJsonController.scala          | 3 +--
 7 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 alerts-server/app/com/alexitc/coinalerts/commons/ErrorId.scala
 delete mode 100644 alerts-server/app/com/alexitc/coinalerts/core/ErrorId.scala

diff --git a/alerts-server/app/com/alexitc/coinalerts/commons/AbstractJsonController.scala b/alerts-server/app/com/alexitc/coinalerts/commons/AbstractJsonController.scala
index fd5416b..630f270 100644
--- a/alerts-server/app/com/alexitc/coinalerts/commons/AbstractJsonController.scala
+++ b/alerts-server/app/com/alexitc/coinalerts/commons/AbstractJsonController.scala
@@ -3,7 +3,7 @@ package com.alexitc.coinalerts.commons
 import javax.inject.Inject
 
 import com.alexitc.coinalerts.commons.FutureOr.Implicits.{FutureOps, OrOps}
-import com.alexitc.coinalerts.core.{ErrorId, MessageKey}
+import com.alexitc.coinalerts.core.MessageKey
 import org.scalactic.{Bad, Every, Good}
 import play.api.i18n.Lang
 import play.api.libs.json._
diff --git a/alerts-server/app/com/alexitc/coinalerts/commons/ErrorId.scala b/alerts-server/app/com/alexitc/coinalerts/commons/ErrorId.scala
new file mode 100644
index 0000000..72632a6
--- /dev/null
+++ b/alerts-server/app/com/alexitc/coinalerts/commons/ErrorId.scala
@@ -0,0 +1,9 @@
+package com.alexitc.coinalerts.commons
+
+import java.util.UUID
+
+case class ErrorId(string: String) extends AnyVal
+
+object ErrorId {
+  def create: ErrorId = ErrorId(UUID.randomUUID().toString.replace("-", ""))
+}
diff --git a/alerts-server/app/com/alexitc/coinalerts/commons/PublicErrorRenderer.scala b/alerts-server/app/com/alexitc/coinalerts/commons/PublicErrorRenderer.scala
index f9e9cae..9808d81 100644
--- a/alerts-server/app/com/alexitc/coinalerts/commons/PublicErrorRenderer.scala
+++ b/alerts-server/app/com/alexitc/coinalerts/commons/PublicErrorRenderer.scala
@@ -1,6 +1,5 @@
 package com.alexitc.coinalerts.commons
 
-import com.alexitc.coinalerts.core.ErrorId
 import play.api.libs.json.{JsValue, Json}
 
 class PublicErrorRenderer {
diff --git a/alerts-server/app/com/alexitc/coinalerts/core/ErrorId.scala b/alerts-server/app/com/alexitc/coinalerts/core/ErrorId.scala
deleted file mode 100644
index 16dfc0b..0000000
--- a/alerts-server/app/com/alexitc/coinalerts/core/ErrorId.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.alexitc.coinalerts.core
-
-case class ErrorId(string: String) extends AnyVal
-object ErrorId {
-  def create: ErrorId = ErrorId(RandomIdGenerator.stringId)
-}
diff --git a/alerts-server/app/com/alexitc/coinalerts/errors/PlayErrorHandler.scala b/alerts-server/app/com/alexitc/coinalerts/errors/PlayErrorHandler.scala
index ad22f1c..53e11f0 100644
--- a/alerts-server/app/com/alexitc/coinalerts/errors/PlayErrorHandler.scala
+++ b/alerts-server/app/com/alexitc/coinalerts/errors/PlayErrorHandler.scala
@@ -2,8 +2,7 @@ package com.alexitc.coinalerts.errors
 
 import javax.inject.{Inject, Singleton}
 
-import com.alexitc.coinalerts.commons.{PublicError, PublicErrorRenderer}
-import com.alexitc.coinalerts.core.ErrorId
+import com.alexitc.coinalerts.commons.{ErrorId, PublicError, PublicErrorRenderer}
 import org.slf4j.LoggerFactory
 import play.api.http.HttpErrorHandler
 import play.api.libs.json.Json
diff --git a/alerts-server/app/controllers/MyJsonController.scala b/alerts-server/app/controllers/MyJsonController.scala
index 48ae2b5..8c37f4d 100644
--- a/alerts-server/app/controllers/MyJsonController.scala
+++ b/alerts-server/app/controllers/MyJsonController.scala
@@ -1,7 +1,6 @@
 package controllers
 
-import com.alexitc.coinalerts.commons.{AbstractJsonController, ServerError}
-import com.alexitc.coinalerts.core.ErrorId
+import com.alexitc.coinalerts.commons.{AbstractJsonController, ErrorId, ServerError}
 import org.slf4j.LoggerFactory
 
 class MyJsonController (components: MyJsonControllerComponents) extends AbstractJsonController(components) {
diff --git a/alerts-server/test/com/alexitc/coinalerts/commons/examples/CustomJsonController.scala b/alerts-server/test/com/alexitc/coinalerts/commons/examples/CustomJsonController.scala
index b75d2d8..4f63775 100644
--- a/alerts-server/test/com/alexitc/coinalerts/commons/examples/CustomJsonController.scala
+++ b/alerts-server/test/com/alexitc/coinalerts/commons/examples/CustomJsonController.scala
@@ -1,7 +1,6 @@
 package com.alexitc.coinalerts.commons.examples
 
-import com.alexitc.coinalerts.commons.{AbstractJsonController, ServerError}
-import com.alexitc.coinalerts.core.ErrorId
+import com.alexitc.coinalerts.commons.{AbstractJsonController, ErrorId, ServerError}
 import org.slf4j.LoggerFactory
 
 class CustomJsonController (components: CustomControllerComponents) extends AbstractJsonController(components) {