From 50b3fb8dcf442ecc05ac7169eeaf1fa95b7efb33 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 1 Apr 2020 13:03:14 +0200
Subject: [PATCH] refactor(workflow): roles as initiators; fix instance scope
 type

---
 models/workflows.model      |  8 ++++----
 src/Model/Types/Workflow.hs | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/models/workflows.model b/models/workflows.model
index a9bcafb96..f1eb7afa2 100644
--- a/models/workflows.model
+++ b/models/workflows.model
@@ -1,14 +1,14 @@
 WorkflowDefinition
     graph      WorkflowGraph
-    initiator  WorkflowInitiator
+    initiator  (WorkflowRole UserId AuthDNF)
 
 WorkflowInitiator
     -- TODO descriptor of a "role" that can initiate an instance of a workflow in a specified scope
 
 WorkflowInstance
     definition  WorkflowDefinition
-    initiator   UserId
+    initiator   (WorkflowRole UserId AuthDNF)
 
-Flow
+Workflow
     instance    WorkflowInstance
-
+    initiator   UserId
diff --git a/src/Model/Types/Workflow.hs b/src/Model/Types/Workflow.hs
index a83ae8768..b0eafd186 100644
--- a/src/Model/Types/Workflow.hs
+++ b/src/Model/Types/Workflow.hs
@@ -40,15 +40,15 @@ data WorkflowGraph = WG
   deriving (Eq, Ord, Show, Read, Data, Generic, Typeable)
 deriveJSON defaultOptions ''WorkflowGraph
 
-
-{-
-data WorkflowInstanceScope = WISGlobal
-                           | WISTerm TermId
-                           | WISSchool SchoolId
-                           | WISCourse CourseId
+data WorkflowInstanceScope term school course = WISGlobal
+                           | WISTerm term
+                           | WISSchool school
+                           | WISCourse course
   deriving (Eq, Ord, Show, Read, Data, Generic, Typeable)
 
 deriveJSON defaultOptions
   { constructorTagModifier = camelToPathPiece' 3
   } ''WorkflowInstanceScope
--}
+
+data WorkflowRole user authdnf = WorkflowRoleUser user
+                               | WorkflowRoleAuthorized authdnf