#7325 : use suppleant_member_id instead of parent_id or is_associated_people to…

#7325 : use suppleant_member_id instead of parent_id or is_associated_people to perform binom checks

members/admin.py

@@ -578,10 +578,12 @@ def delete_shift_template_registration(request):
                 if res["set_done"]:
                     """ Delete pair(s?) of partner if it is a parent to improve statistics (#4810) """
                     api = OdooAPI()
-                    associated_members = api.search_read('res.partner', [['parent_id', '=', partner_id]], ['id'])
+                    associated_members = api.search_read('res.partner', [['parent_id', '=', partner_id]], ['id', 'suppleant_member_id'])
                     for am in associated_members:
-                        data = {"child": {"id": am["id"]}, "gone": ["parent", "child"]}
-                        delete_pair_core(data)
+                        # Do not call delete_pair_core if contact is not a binom
+                        if am['suppleant_member_id']:
+                            data = {"child": {"id": am["id"]}, "gone": ["parent", "child"]}
+                            delete_pair_core(data)
 
         except Exception as e:
             res["error"] = str(e)
@@ -707,6 +709,7 @@ def get_member_info(request, id):
             'current_template_name',
             'shift_type',
             'parent_id',
+            'suppleant_member_id',
             'is_associated_people',
             'parent_name',
             "makeups_to_do",
@@ -716,8 +719,9 @@ def get_member_info(request, id):
         member = api.search_read('res.partner', cond, fields)
         if member:
             member = member[0]
-            parent = None
             if member['parent_id']:
+                if not member['suppleant_member_id']:
+                    return JsonResponse({"message": "Accès non supporté (rattaché non suppléant)."}, status=404)
                 res_parent = api.search_read('res.partner', [['id', '=', int(member['parent_id'][0])]], ['barcode_base', 'email'])
                 if res_parent:
                     parent = res_parent[0]
@@ -796,28 +800,33 @@ def create_pair(request):
                                                      "final_standard_points",
                                                      "final_ftop_points",
                                                      'shift_type'
-                                                     'parent_id'])[0]
+                                                     'parent_id',
+                                                     'suppleant_member_id'])[0]
+
+            case = isPartnerInvolvedInBinom(api, child)
+
             errors = []
-            if child['nb_associated_people'] > 0:
-                # le membre est déjà titulaire d'un binôme
-                errors.append("Le membre suppléant sélectionné est titulaire d'un bînome")
+            if case == "MEMBER_SUPPLEANT_OF_BINOM":
+                errors.append("Le suppléant sélectionné est déjà suppléant d'un binôme.")
+            elif case == "CONTACT_OF_MEMBER_SUPPLEANT_OF_BINOM":
+                errors.append("Le suppléant sélectionné est déjà (le contact d'un membre) suppléant d'un binôme.")
+            elif case == "TITULAIRE_OF_BINOM":
+                errors.append("Le suppléant sélectionné est déjà titulaire d'un binôme.")
+
             # le membre suppléant fait parti du commité?
             if child['current_template_name'] == "Services des comités":
                 errors.append("Le membre suppléant séléctionné fait parti du comité")
-            # Verifier que le suppléant n'est pas déjà en binôme soit titulaire soit suppléant
-            for m in api.search_read('res.partner', [['email', '=', child['email']]]):
-                if m['is_associated_people']:
-                    errors.append('Le membre suppléant est déjà en bînome')
-                if m['child_ids']:
-                    errors.append("Le membre suppléant sélectionné est titulaire d'un binôme")
-            # le membre titulaire a déjà un/des suppléants?
-            if parent['nb_associated_people'] >= 1:
-                # On récupère le/s suppléant(s)
-                associated_members = api.search_read('res.partner', [['parent_id', '=', parent_id]], ['id', 'age'])
-                # le suppléant est un mineur?
-                for m in associated_members:
-                    if m['age'] > 18:
-                        errors.append("Le membre titulaire sélectionné a déjà un suppléant")
+
+            case = isPartnerInvolvedInBinom(api, parent)
+
+            errors = []
+            if case == "MEMBER_SUPPLEANT_OF_BINOM":
+                errors.append("Le titulaire sélectionné est déjà suppléant d'un binôme.")
+            elif case == "CONTACT_OF_MEMBER_SUPPLEANT_OF_BINOM":
+                errors.append("Le titulaire sélectionné est déjà (le contact d'un membre) suppléant d'un binôme.")
+            elif case == "TITULAIRE_OF_BINOM":
+                errors.append("Le titulaire sélectionné est déjà titulaire d'un binôme.")
+
             if errors:
                 return JsonResponse({"errors": errors}, status=409)
 
@@ -925,6 +934,27 @@ def create_pair(request):
         return JsonResponse({"message": "Method Not Allowed"}, status=405)
 
 
+def isPartnerInvolvedInBinom(api, partner):
+    # First make sure the selected partner "is not already a suppleant"
+    # Let's be prudent : cover both case of partner being suppleant member,
+    # and case of partner being the contact of a suppleant member
+    contact_of_partner_suppleant = api.search_read('res.partner', [['suppleant_member_id', '=', partner['id']]])
+    if contact_of_partner_suppleant:
+        # partner has a suppleant contact therefore it is a suppleant member
+        return "MEMBER_SUPPLEANT_OF_BINOM"
+    if partner['parent_id'] and partner['suppleant_member_id']:
+        # partner is the contact of a suppleant member
+        return "CONTACT_OF_MEMBER_SUPPLEANT_OF_BINOM"
+
+    # Second make sure the selected partner is not a titulaire
+    children_of_partner = api.search_read('res.partner', [['parent_id', '=', partner['id']]])
+    suppleant_of_partner = [x for x in children_of_partner if x['suppleant_member_id']]
+    if suppleant_of_partner:
+        # partner is titulaire
+        return "TITULAIRE_OF_BINOM"
+
+    return None
+
 def delete_pair(request):
     """
     Administration des binômes membres

members/models.py

@@ -203,6 +203,7 @@ class CagetteMember(models.Model):
             if getattr(settings, 'ALLOW_NON_MEMBER_TO_CONNECT', False) is False:
                 cond.append('|')
                 cond.append(['is_member', '=', True])
+                # TODO : consider replacing is_associated_people by suppleant_member_id to exclude mineurs rattachés
                 cond.append(['is_associated_people', '=', True])
 
             fields = ['name', 'email', 'birthdate_date', 'create_date', 'cooperative_state', 'is_associated_people', 'barcode_base']
@@ -212,6 +213,7 @@ class CagetteMember(models.Model):
             if (res and len(res) >= 1):
                 coop_id = None
                 hashed_password = None
+                # TODO : add comment to explain why there is a loop here
                 for item in res:
                     coop = item
                     if 'hashed_password' in item:
@@ -219,6 +221,7 @@ class CagetteMember(models.Model):
                     if item["birthdate_date"] is not False:
                         coop_birthdate = item['birthdate_date']
                         coop_state = item['cooperative_state']
+                    # TODO : consider replacing is_associated_people check by suppleant_member_id to exclude mineurs rattachés
                     if item["is_associated_people"] == True:
                         coop_id = item['id']
 
@@ -460,18 +463,12 @@ class CagetteMember(models.Model):
     def is_associated(id_parent):
         api = OdooAPI()
         cond = [['parent_id', '=', int(id_parent)]]
-        fields = ['id','name','parent_id','birthdate_date']
+        fields = ['id','name','parent_id','birthdate_date','suppleant_member_id']
         res = api.search_read('res.partner', cond, fields, 10, 0, 'id DESC')
-        already_have_adult_associated = False
         for partner in res:
-            birthdate = partner['birthdate_date']
-            if(birthdate):
-                today = date.today()
-                date1 = datetime.datetime.strptime(birthdate, "%Y-%m-%d")
-                age = today.year - date1.year - ((today.month, today.day) < (date1.month, date1.day))
-                if age > 17 :
-                    already_have_adult_associated = True
-        return already_have_adult_associated
+            if partner['suppleant_member_id']:
+                return True
+        return False
 
     @staticmethod
     def finalize_coop_creation(post_data):
@@ -901,6 +898,7 @@ class CagetteMember(models.Model):
             cond = [['name', 'ilike', str(key)]]
         cond.append('|')
         cond.append(['is_member', '=', True])
+        #TODO : replace is_associated_people check by suppleant_member_id check to exclude mineurs rattachés
         if search_type != 'members' and search_type != 'envelops':
             cond.append(['is_associated_people', '=', True])
         else:
@@ -1044,14 +1042,14 @@ class CagetteMember(models.Model):
         res = {}
 
         c = [["parent_id", "=", self.id]]
-        f = ["id", "name", "barcode_base"]
+        f = ["id", "name", "barcode_base", 'suppleant_member_id']
 
         res = self.o_api.search_read('res.partner', c, f)
 
-        try:
-            return res[0]
-        except:
-            return None
+        for partner in res:
+            if partner['suppleant_member_id']:
+                return partner
+        return None
 
     def update_member_makeups(self, member_data):
         api = OdooAPI()
@@ -1431,10 +1429,11 @@ class CagetteMembers(models.Model):
     @staticmethod
     def get_attached_members():
         api = OdooAPI()
-        cond = [['is_associated_people','=', True]]
-        fields = ['id', 'name', 'parent_name']
+        cond = [['is_associated_people', '=', True]]
+        fields = ['id', 'name', 'parent_name', 'suppleant_member_id']
         res = api.search_read('res.partner', cond, fields)
-        return res
+        # Exclude mineurs rattachés
+        return [x for x in res if res['suppleant_member_id']]
 
 class CagetteUser(models.Model):
 

members_space/views.py

@@ -218,7 +218,7 @@ def home(request):
         if partnerData['cooperative_state'] == "unsubscribed":
             coop_can_change_shift_template = False
         if getattr(settings, 'ASSOCIATE_PEOPLE_CAN_CHANGE_SHIFT_TEMPLE_REGISTRATION', False) is False:
-            if partnerData['is_associated_people'] is True:
+            if partnerData['suppleant_member_id']:
                 coop_can_change_shift_template = False
     context = {
         'title': 'Espace Membres',

shifts/models.py

@@ -181,11 +181,11 @@ class CagetteShift(models.Model):
                   'cooperative_state', 'final_standard_point', 'create_date',
                   'final_ftop_point', 'shift_type', 'leave_ids', 'makeups_to_do', 'barcode_base',
                   'street', 'street2', 'zip', 'city', 'mobile', 'phone', 'function', 'email',
-                  'is_associated_people', 'parent_id', 'extra_shift_done']
+                  'is_associated_people', 'parent_id', 'suppleant_member_id', 'extra_shift_done']
         partnerData = self.o_api.search_read('res.partner', cond, fields, 1)
         if partnerData:
             partnerData = partnerData[0]
-            if partnerData['is_associated_people']:
+            if partnerData['suppleant_member_id']:
                 cond = [['id', '=', partnerData['parent_id'][0]]]
                 fields = ['create_date', 'makeups_to_do', 'date_delay_stop', 'extra_shift_done']
                 parentData = self.o_api.search_read('res.partner', cond, fields, 1)
@@ -205,7 +205,7 @@ class CagetteShift(models.Model):
                         self.o_api.update('res.partner', [id], {'makeups_to_do': partnerData['makeups_to_do']})
                     except Exception as e:
                         coop_logger.error("update res.partner.makeups_to_do %s", str(e))
-            if partnerData['is_associated_people']:
+            if partnerData['suppleant_member_id']:
                 cond = [['partner_id.id', '=', partnerData['parent_id'][0]]]
             else:
                 cond = [['partner_id.id', '=', id]]
@@ -366,10 +366,10 @@ class CagetteShift(models.Model):
         # partner_id can be 'associated_people' one, which is never use as shift partner_id reference
         # So, let's first retrieved data about the res.partner involved
         cond = [['id', '=', int(data['idPartner'])]]
-        fields = ['parent_id']
+        fields = ['parent_id', 'suppleant_member_id']
         partner = self.o_api.search_read('res.partner', cond, fields, 1)
         if partner:
-            if partner[0]['parent_id']:
+            if partner[0]['suppleant_member_id']:
                 partner_id = partner[0]['parent_id'][0]
             else:
                 partner_id = int(data['idPartner'])
@@ -690,8 +690,9 @@ class CagetteServices(models.Model):
                         for m in s['members']:
                             mids.append(m['partner_id'][0])
                         cond = [['parent_id', 'in', mids]]
-                        fields = ['id', 'parent_id', 'name','barcode_base']
-                        associated = api.search_read('res.partner', cond, fields)
+                        fields = ['id', 'parent_id', 'name', 'barcode_base', 'suppleant_member_id']
+                        attached = api.search_read('res.partner', cond, fields)
+                        associated = [x for x in attached if x['suppleant_member_id']]
 
                         if len(associated) > 0:
                             for m in s['members']: