Merge pull request #4139 from prisma/DateTimeInSubscriptionsSpec

Subscription DateTime Bug

Author: do4gr

server/servers/api/src/main/scala/com/prisma/api/mutactions/SubscriptionEvents.scala

@@ -33,7 +33,6 @@ object SubscriptionEvents {
 
   private def fromUpdateResult(project: Project, mutationId: Id, result: UpdateNodeResult): PublishSubscriptionEvent = {
     val previousValues: Map[String, Any] = result.previousValues.data
-      .filterKeys(k => result.namesOfUpdatedFields.contains(k))
       .filterValues(v => v != NullGCValue && !v.isInstanceOf[RootGCValue])
       .toMapStringAny + ("id" -> result.previousValues.id.value)
 

server/servers/api/src/main/scala/com/prisma/util/coolArgs/GcConverters.scala

@@ -82,6 +82,7 @@ case class GCCreatePrismaArgsConverter(model: Model) {
   def toPrismaArgsFromJson(json: JsValue): PrismaArgs = {
 
     def fromSingleJsValue(jsValue: JsValue, field: ScalarField): GCValue = jsValue match {
+      case JsString(x) if field.typeIdentifier == TypeIdentifier.DateTime => DateTimeGCValue(new DateTime(x))
       case JsString(x)                                                    => StringGCValue(x)
       case JsNumber(x) if field.typeIdentifier == TypeIdentifier.Int      => IntGCValue(x.toInt)
       case JsNumber(x) if field.typeIdentifier == TypeIdentifier.Float    => FloatGCValue(x.toDouble)
@@ -93,15 +94,16 @@ case class GCCreatePrismaArgsConverter(model: Model) {
       val gCValue: JsLookupResult = json \ field.name
       val asOption                = gCValue.toOption
       val converted = asOption match {
-        case None                                                              => NullGCValue
-        case Some(JsNull)                                                      => NullGCValue
-        case Some(JsString(x))                                                 => StringGCValue(x)
-        case Some(JsNumber(x)) if field.typeIdentifier == TypeIdentifier.Int   => IntGCValue(x.toInt)
-        case Some(JsNumber(x)) if field.typeIdentifier == TypeIdentifier.Float => FloatGCValue(x.toDouble)
-        case Some(JsBoolean(x))                                                => BooleanGCValue(x)
-        case Some(JsArray(x)) if field.isList                                  => ListGCValue(x.map(v => fromSingleJsValue(v, field)).toVector)
-        case Some(x: JsValue) if field.typeIdentifier == TypeIdentifier.Json   => JsonGCValue(x)
-        case x                                                                 => sys.error("Not implemented yet: " + x)
+        case None                                                                 => NullGCValue
+        case Some(JsNull)                                                         => NullGCValue
+        case Some(JsString(x)) if field.typeIdentifier == TypeIdentifier.DateTime => DateTimeGCValue(new DateTime(x))
+        case Some(JsString(x))                                                    => StringGCValue(x)
+        case Some(JsNumber(x)) if field.typeIdentifier == TypeIdentifier.Int      => IntGCValue(x.toInt)
+        case Some(JsNumber(x)) if field.typeIdentifier == TypeIdentifier.Float    => FloatGCValue(x.toDouble)
+        case Some(JsBoolean(x))                                                   => BooleanGCValue(x)
+        case Some(JsArray(x)) if field.isList                                     => ListGCValue(x.map(v => fromSingleJsValue(v, field)).toVector)
+        case Some(x: JsValue) if field.typeIdentifier == TypeIdentifier.Json      => JsonGCValue(x)
+        case x                                                                    => sys.error("Not implemented yet: " + x)
 
       }
       field.name -> converted