Fix has condition

app.py

@@ -443,8 +443,24 @@ def has_object(id):

                                
                                
                                
                            
                                
                                    
                                        
                                            443  
                                                if object_ is None:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            444  
                                                    flask.abort(404)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            445  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        446 -
                                            query = db.session.query(PictureResource).join(PictureRegion).filter(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        447 -
                                                PictureRegion.object_id == id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        446 +
                                            descendants_cte = (
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        447 +
                                                db.select(PictureObject.id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        448 +
                                                .where(PictureObject.id == id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        449 +
                                                .cte(name="descendants_cte", recursive=True)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        450 +
                                            )
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        451 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        452 +
                                            descendants_cte = descendants_cte.union_all(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        453 +
                                                db.select(PictureObjectInheritance.child_id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        454 +
                                                .where(PictureObjectInheritance.parent_id == descendants_cte.c.id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        455 +
                                            )
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        456 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        457 +
                                            query = db.session.query(PictureResource).filter(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        458 +
                                                PictureResource.regions.any(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        459 +
                                                    PictureRegion.object_id.in_(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        460 +
                                                        db.select(descendants_cte.c.id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        461 +
                                                    )
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        462 +
                                                )
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        463 +
                                            )
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            464  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            465  
                                                page = int(flask.request.args.get("page", 1))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            466  
                                                per_page = int(flask.request.args.get("per_page", 16))
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -1149,28 +1165,30 @@ class APIError(Exception):

                                
                                
                                
                            
                                
                                    
                                        
                                            1165  
                                            def get_picture_query(query_data):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1166  
                                                query = db.session.query(PictureResource)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1167  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1152 -
                                            descendants_cte = (
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1153 -
                                                db.select(PictureObject.id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1154 -
                                                .where(PictureObject.id == PictureRegion.object_id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1155 -
                                                .cte(name="descendants_cte", recursive=True)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1156 -
                                            )
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1168 +
                                            def has_condition(id):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1169 +
                                                descendants_cte = (
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1170 +
                                                    db.select(PictureObject.id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1171 +
                                                    .where(PictureObject.id == id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1172 +
                                                    .cte(name=f"descendants_cte_{id}", recursive=True)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1173 +
                                                )
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1174  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1158 -
                                            descendants_cte = descendants_cte.union_all(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1159 -
                                                db.select(PictureObjectInheritance.child_id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1160 -
                                                .where(PictureObjectInheritance.parent_id == descendants_cte.c.id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1161 -
                                            )
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1175 +
                                                descendants_cte = descendants_cte.union_all(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1176 +
                                                    db.select(PictureObjectInheritance.child_id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1177 +
                                                    .where(PictureObjectInheritance.parent_id == descendants_cte.c.id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1178 +
                                                )
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1179 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1180 +
                                                return PictureResource.regions.any(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1181 +
                                                    PictureRegion.object_id.in_(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1182 +
                                                        db.select(descendants_cte.c.id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1183 +
                                                    )
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1184 +
                                                )
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1185  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1186  
                                                requirement_conditions = {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1187  
                                                    # Has an object with the ID in the given list
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1188  
                                                    "has_object": lambda value: PictureResource.regions.any(
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1189  
                                                            PictureRegion.object_id.in_(value)),
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1190  
                                                    # Has an object with the ID in the given list, or a subtype of it
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1168 -
                                                "has": lambda value: PictureResource.regions.any(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1169 -
                                                    PictureRegion.object_id.in_(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1170 -
                                                        db.select(descendants_cte.c.id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1171 -
                                                    )
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1172 -
                                                ),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1173 -
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1191 +
                                                "has": lambda value: db.or_(*[has_condition(id) for id in value]),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1192  
                                                    "nature": lambda value: PictureResource.nature_id.in_(value),
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1193  
                                                    "licence": lambda value: PictureResource.licences.any(
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1194  
                                                            PictureLicence.licence_id.in_(value)),