Add recursive class query

app.py

@@ -174,9 +174,12 @@ with app.app_context():

                                
                                
                                
                            
                                
                                    
                                        
                                            174  
                                                                                   foreign_keys=[PictureObjectInheritance.child_id],
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            175  
                                                                                   back_populates="child")
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            176  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        177 -
                                                def __init__(self, id, description):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        177 +
                                                def __init__(self, id, description, parents):
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            178  
                                                        self.id = id
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            179  
                                                        self.description = description
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        180 +
                                                    if parents:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        181 +
                                                        for parent in parents:
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        182 +
                                                            db.session.add(PictureObjectInheritance(parent, self))
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            183  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            184  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            185  
                                                class PictureRegion(db.Model):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -1140,9 +1143,28 @@ class APIError(Exception):

                                
                                
                                
                            
                                
                                    
                                        
                                            1143  
                                            def get_picture_query(query_data):
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1144  
                                                query = db.session.query(PictureResource)
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1145  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1146 +
                                            descendants_cte = (
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1147 +
                                                db.select(PictureObject.id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1148 +
                                                .where(PictureObject.id == PictureRegion.object_id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1149 +
                                                .cte(name="descendants_cte", recursive=True)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1150 +
                                            )
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1151 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1152 +
                                            descendants_cte = descendants_cte.union_all(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1153 +
                                                db.select(PictureObjectInheritance.child_id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1154 +
                                                .where(PictureObjectInheritance.parent_id == descendants_cte.c.id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1155 +
                                            )
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1156 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1157  
                                                requirement_conditions = {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1158 +
                                                # Has an object with the ID in the given list
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1159  
                                                    "has_object": lambda value: PictureResource.regions.any(
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1160  
                                                            PictureRegion.object_id.in_(value)),
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1161 +
                                                # Has an object with the ID in the given list, or a subtype of it
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1162 +
                                                "has": lambda value: PictureResource.regions.any(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1163 +
                                                    PictureRegion.object_id.in_(
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1164 +
                                                        db.select(descendants_cte.c.id)
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1165 +
                                                    )
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1166 +
                                                ),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        1167 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1168  
                                                    "nature": lambda value: PictureResource.nature_id.in_(value),
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1169  
                                                    "licence": lambda value: PictureResource.licences.any(
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            1170  
                                                            PictureLicence.licence_id.in_(value)),