Merge branch 'main' into main

Author: jaimin001

backend/family_tree/student/schema.py

@@ -8,14 +8,26 @@ class Meta:
         model= Student
         fields= ("id","name","branch","year","picture","homeTown","extraCurriculars","socialMedia", "linkedIn","email","parentId","roll_no")
         filter_fields=["id","name","branch","year","email","parentId","roll_no"]
-
+def tree_for_batch(root,info,batch):
+    tree_for_batch=[]
+    for student in batch:
+        roll= student.roll_no
+        pathObjects=[]
+        while(Student.objects.get(roll_no=roll).parentId!="root"):
+            student=Student.objects.get(roll_no=roll)
+            pathObjects.append(student)
+            roll= student.parentId
+        pathObjects.append(Student.objects.get(roll_no=roll))
+        tree_for_batch.append(pathObjects)
+    return tree_for_batch
 
 class Query(graphene.ObjectType):
     students=graphene.List(StudentType)
     children=graphene.List(StudentType, parentId=graphene.String())
     student_path= graphene.List(StudentType, roll=graphene.String())
     student_sibling= graphene.List(StudentType, roll=graphene.String())
     student_search= graphene.List(StudentType, search_query=graphene.String())
+    student_batch= graphene.List(graphene.List(StudentType), roll=graphene.String())
 
     def resolve_students(root,info):
         return Student.objects.all()
@@ -37,6 +49,17 @@ def resolve_student_sibling(root,info, roll):
         return Student.objects.filter(parentId=student.parentId).exclude(roll_no=roll)
 
 
+    def resolve_student_batch(root,info,roll):
+        current_node= Student.objects.get(roll_no=roll)
+        year_of_node= current_node.year
+        current_batch= Student.objects.filter(year=year_of_node)
+        # tree_for_batch=[]
+        # for person in current_batch:
+        #     tree_for_batch.append(Query.resolve_student_path(root,info,person.roll_no))
+        # return tree_for_batch
+        return tree_for_batch(root,info,current_batch)
+
+
     def resolve_student_search(root,info, search_query):
         return Student.objects.filter(Q(name__icontains=search_query) | Q(roll_no__icontains= search_query))[0:8]
 

backend/family_tree/student/tests.py

@@ -14,12 +14,13 @@ def setUp(self):
         self.student2 = mixer.blend(Student, name='student2', roll_no='2', parentId='1')
         self.student3 = mixer.blend(Student, name='student3', roll_no='3', parentId='1')
         self.student4 = mixer.blend(Student, name='student4', roll_no='4', parentId='1')
-
+    
+    
     def test_children_query(self):
         response = self.query('''
             query {
-                students {
-                    id
+                children(parentId: "1"){
+                    rollNo
                     name
                   }
                 }
@@ -30,3 +31,31 @@ def test_children_query(self):
         self.assertDictEqual(content['data']['children'][0], {'rollNo': '2', 'name': 'student2'})
         self.assertDictEqual(content['data']['children'][1], {'rollNo': '3', 'name': 'student3'})
         self.assertDictEqual(content['data']['children'][2], {'rollNo': '4', 'name': 'student4'})
+        
+    def test_student_query(self):
+        response = self.query('''
+            query {
+                students {
+                    id
+                    name
+                  }
+                }
+              ''')
+        content = json.loads(response.content)
+        self.assertResponseNoErrors(response)
+        self.assertDictEqual(content['data']['students'][0], {'id': str(self.student1.id), 'name': self.student1.name})
+        self.assertDictEqual(content['data']['students'][1], {'id': str(self.student2.id), 'name': self.student2.name})\
+        
+    def test_student_sibling(self):
+        response = self.query('''
+            query {
+                studentSibling(roll: "2") {
+                    id
+                    name
+                  }
+                }
+              ''')
+        content= json.loads(response.content)
+        self.assertResponseNoErrors(response)
+        self.assertDictEqual(content['data']['studentSibling'][0], {'id': str(self.student3.id), 'name': self.student3.name})
+        self.assertDictEqual(content['data']['studentSibling'][1], {'id': str(self.student4.id), 'name': self.student4.name})