From 460bd9d3e5b27a0bd8232ec8ff2732761e0e1080 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Thu, 2 Apr 2020 18:28:18 +0200
Subject: [PATCH] chore(workflow-types): import authdns

---
 models/workflows.model      |  6 +++---
 src/Model/Types/Workflow.hs | 19 +++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/models/workflows.model b/models/workflows.model
index 6396cb385..c87a792bb 100644
--- a/models/workflows.model
+++ b/models/workflows.model
@@ -1,14 +1,14 @@
 WorkflowDefinition
-    graph       (WorkflowGraph UserId AuthDNF FileId)
+    graph       (WorkflowGraph UserId FileId)
     scope       WorkflowInstanceScope'
 
 WorkflowInstance
     definition  WorkflowDefinition
-    graph       (WorkflowGraph UserId AuthDNF FileId)
+    graph       (WorkflowGraph UserId FileId)
     scope       (WorkflowInstaceScope TermId SchoolId CourseId)
 
 Workflow
     instance    WorkflowInstance
-    graph       (WorkflowGraph UserId AuthDNF FileId)
+    graph       (WorkflowGraph UserId FileId)
     initiator   UserId Maybe
     payload     (WorkflowPayload FileId)
diff --git a/src/Model/Types/Workflow.hs b/src/Model/Types/Workflow.hs
index aa1852773..441a1e4a5 100644
--- a/src/Model/Types/Workflow.hs
+++ b/src/Model/Types/Workflow.hs
@@ -2,10 +2,12 @@ module Model.Types.Workflow where
 
 import Import.NoModel
 
+import Model.Types.Security (AuthDNF)
 
-data WorkflowRole userid authdnf = WorkflowRoleUser userid
-                                 | WorkflowRoleAuthorized authdnf
-                                 | WorkflowRoleInitiator userid
+
+data WorkflowRole userid = WorkflowRoleUser userid
+                         | WorkflowRoleAuthorized AuthDNF
+                         | WorkflowRoleInitiator userid
 
 
 data WorkflowGraphNodeStatus = WGNS
@@ -15,9 +17,8 @@ data WorkflowGraphNodeStatus = WGNS
   }
   deriving (Eq, Ord, Show, Read, Data, Generic, Typeable)
 
-data WorkflowGraphNode userid authdnf fileid = WGN
+data WorkflowGraphNode = WGN
   { wgnStatus   :: WorkflowGraphNodeStatus
-  , wgnOutgoing :: Set (WorkflowGraphEdge userid authdnf fileid)
   }
 
 type WorkflowGraphNodeLabel = CI Text
@@ -65,16 +66,14 @@ data WorkflowEdgePayloadSpecification fileid userid = forall payload. (FromJSON
 data WorkflowPayload userid fileid = forall payload. Map WorkflowEdgePayloadLabel (WorkflowEdgePayload userid fileid payload)
 
 
-data WorkflowGraphEdge userid authdnf fileid = WGE
-  { wgeActors  :: Set (WorkflowRole userid authdnf)
+data WorkflowGraphEdge userid fileid = WGE
+  { wgeActors  :: Set (WorkflowRole userid)
   , wgeTarget  :: WorkflowGraphNodeLabel
   , wgeForm    :: Map WorkflowEdgePayloadLabel (NonNull (Set (WorkflowEdgePayloadSpecification fileid userid)))
   }
 
 
-data WorkflowGraph userid authdnf fileid = WorkflowGraph
-  { wgNodes :: Map WorkflowGraphNodeLabel (WorkflowGraphNode userid authdnf fileid, Set (WorkflowGraphEdge userid authdnf fileid))
-  }
+data WorkflowGraph userid fileid = WorkflowGraph (Map WorkflowGraphNodeLabel (WorkflowGraphNode, Set (WorkflowGraphEdge userid fileid)))
 
 
 data WorkflowInstanceScope term school course = WISGlobal | WISTerm term | WISSchool school | WISCourse course