1.1.3

manifest.json

@@ -20,9 +20,17 @@
       "formula": "src/consent/consent.mfotl",
       "signature": "src/consent/consent.sig"
     },
-    "right_to_erasure": {
-      "formula": "src/right_to_erasure/right_to_erasure.mfotl",
-      "signature": "src/right_to_erasure/right_to_erasure.sig"
+    "delete": {
+      "formula": "src/delete/delete.mfotl",
+      "signature": "src/delete/delete.sig"
+    },
+    "delete_processing": {
+      "formula": "src/delete_processing/delete_processing.mfotl",
+      "signature": "src/delete_processing/delete_processing.sig"
+    },
+    "delete_publish": {
+      "formula": "src/delete_publish/delete_publish.mfotl",
+      "signature": "src/delete_publish/delete_publish.sig"
     },
     "right_to_restriction_of_processing": {
       "formula": "src/right_to_restriction_of_processing/right_to_restriction_of_processing.mfotl",

src/delete/delete.mfotl

+ds_deletion_request(data,dataid,dsid) AND (NOT EVENTUALLY[0,30d] delete(data,dataid,dsid))
\ No newline at end of file

src/delete/delete.sig

+ds_deletion_request(data:string, dataid:string, dsid:string)
+delete(data:string, dataid:string, dsid:string)

src/delete_processing/delete_processing.mfotl

+use(data,dataid,dsid) AND (NOT ONCE (ds_consent(dsid,data) OR legal_grounds(dsid,data)))
\ No newline at end of file

src/delete_processing/delete_processing.sig

+use(data:string, dataid:string, dsid:string)
+ds_consent(dsid:string, data:string)
+legal_grounds(dsid:string, data:string)

src/delete_publish/delete_publish.mfotl

+ds_deletion_request(data, dataid, dsid) AND ONCE share_with(p, dataid) AND NOT EVENTUALLY[0,30d] notify_proc(p,dataid) 
\ No newline at end of file

src/right_to_erasure/right_to_erasure.sig → src/delete_publish/delete_publish.sig

 ds_deletion_request(data:string, dataid:string, dsid:string)
-delete(data:string, dataid:string, dsid:string)
-use(data:string, dataid:string, dsid:string)
 share_with(processorid:string, dataid:string)
 notify_proc(processorid:string, dataid:string)

src/gdpr.mfotl

@@ -2,12 +2,16 @@ LET lawful_processing(data,dataid,dsid) = f"lawful_processing/lawful_processing.
 LET consent(data,dataid,dsid) = f"consent/consent.mfotl"s"consent/consent.sig" IN
 LET info_on_consent(data,dataid,dsid) = f"info_on_consent/info_on_consent.mfotl"s"info_on_consent/info_on_consent.sig" IN
 LET right_to_access(dsid) = f"right_to_access/right_to_access.mfotl"s"right_to_access/right_to_access.sig" IN
-LET right_to_erasure(data,dataid,dsid) = f"right_to_erasure/right_to_erasure.mfotl"s"right_to_erasure/right_to_erasure.sig" IN
+LET delete(data,dataid,dsid) = f"delete/delete.mfotl"s"delete/delete.sig" IN
+LET delete_processing(data,dataid,dsid) = f"delete_processing/delete_processing.mfotl"s"delete_processing/delete_processing.sig" IN
+LET delete_publish(data,dataid,dsid,d) = f"delete_publish/delete_publish.mfotl"s"delete_publish/delete_publish.sig" IN
 LET right_to_restriction_of_processing(data,dataid,dsid) = f"right_to_restriction_of_processing/right_to_restriction_of_processing.mfotl"s"right_to_restriction_of_processing/right_to_restriction_of_processing.sig" IN
 LET right_to_object(data,dataid,dsid) = f"right_to_object/right_to_object.mfotl"s"right_to_object/right_to_object.sig" IN
 (lawful_processing(data,dataid,dsid) AND type="lawful_processing") OR
 (consent(data,dataid,dsid) AND type="consent") OR
 (info_on_consent(data,dataid,dsid) AND type="info_on_consent") OR
 (right_to_object(data,dataid,dsid) AND type="right_to_object") OR
-(right_to_erasure(data,dataid,dsid) AND type = "right_to_erasure") OR 
+(delete(data,dataid,dsid) AND type = "delete") OR 
+(delete_processing(data,dataid,dsid) AND type = "delete") OR 
+(EXISTS d. delete_publish(data,dataid,dsid,d) AND type = "delete") OR 
 (right_to_restriction_of_processing(data,dataid,dsid) AND type = "right_to_restriction_of_processing")

src/right_to_erasure/right_to_erasure.mfotl

-LET right_to_erasure_1(data,dataid,dsid) = ds_deletion_request(data,dataid,dsid) AND (NOT EVENTUALLY[0,30d] delete(data,dataid,dsid)) IN
-LET right_to_erasure_2(data,dataid,dsid) = use(data,dataid,dsid) AND ONCE delete(data,dataid,dsid) IN
-LET right_to_erasure_3(data,dataid,dsid,procid) = ds_deletion_request (data, dataid, dsid) AND ONCE share_with( procid , dataid) AND NOT EVENTUALLY[0,30d] notify_proc(procid , dataid) IN
-(EXISTS procid. right_to_erasure_3(data,dataid,dsid,procid))
-OR
-(right_to_erasure_1(data,dataid,dsid) OR right_to_erasure_2(data,dataid,dsid))
\ No newline at end of file