[merge] merge and solve conflict

SiteManagementSystem(SoftwareEngineering)/Service/PythonServiceFile/layer.py

@@ -1,4 +1,4 @@
-import clr
+import clr
 from user import User
 from field import Field
 from user_field import FieldRecord
@@ -11,6 +11,7 @@ class Layer:
     def __init__(self, layer):
         self._field_db = layer.FieldDb
         self._record_db = layer.RecordDb
+        self._finished_field_recoed_db = layer.FinishedFieldRecordDb
 
     def add_field(self, field: Field) -> 'Layer':
         self._field_db.Add(field.parse_to_csharp_object(self._field_db.GetDefaultEntity()))
@@ -35,3 +36,16 @@ class Layer:
     def remove_record(self, record: FieldRecord) -> 'Layer':
         self._record_db.TryDelete("Uid", record.parse_to_csharp_object(self._record_db.GetDefaultEntity()).Uid)
         return self
+
+    def add_finished_record(self, record: UserFieldRecord) -> 'Layer':
+        self._finished_field_recoed_db.Add(record.parse_to_csharp_object(self._finished_field_recoed_db.GetDefaultEntity()))
+        return self
+
+    def find_finished_record(self, key: str, value: str) -> [UserFieldRecord]:
+        return [UserFieldRecord(t) for t in self._finished_field_recoed_db.FindAll(key, Guid.Parse(value))]
+
+    # One User only allowed to book one field at a time
+    def remove_finished_record(self, record: UserFieldRecord) -> 'Layer':
+        self._finished_field_recoed_db.TryDelete("Uid", record.parse_to_csharp_object(self._finished_field_recoed_db.GetDefaultEntity()).Uid)
+        return self
+