Skip to content

Commit e9eeec6

Browse files
authored
Merge pull request #75 from Ronak-23/main
changes parentId for first batch to none
2 parents afbc655 + 5780fed commit e9eeec6

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

backend/family_tree/family_tree/urls.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717
from django.urls import include, path
1818
from graphene_django.views import GraphQLView
1919
from student.views import upload
20+
from django.views.decorators.csrf import csrf_exempt
2021

2122
urlpatterns = [
2223
path('admin/', admin.site.urls),
23-
path("graphql", GraphQLView.as_view(graphiql=True)),
24+
path("graphql", csrf_exempt(GraphQLView.as_view(graphiql=True))),
2425
path('students/', include('student.urls')),
2526
path('importexcel/', upload),
2627
]

backend/family_tree/student/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Student(models.Model):
1515
socialMedia= models.ForeignKey(SocialMedia, on_delete=models.CASCADE, default=None, blank=True, null=True)
1616
linkedIn= models.URLField(max_length=200)
1717
email= models.EmailField(max_length=254)
18-
parentId= models.CharField(max_length=400)
18+
parentId= models.CharField(max_length=400, default=None, blank=True, null=True)
1919

2020

2121

backend/family_tree/student/schema.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def tree_for_batch(root,info,batch):
1313
for student in batch:
1414
roll= student.roll_no
1515
pathObjects=[]
16-
while(Student.objects.get(roll_no=roll).parentId!="root"):
16+
while(Student.objects.get(roll_no=roll).parentId!=None):
1717
student=Student.objects.get(roll_no=roll)
1818
pathObjects.append(student)
1919
roll= student.parentId
@@ -37,7 +37,7 @@ def resolve_children(root, info, parentId):
3737

3838
def resolve_student_path(root, info, roll):
3939
pathObjects=[]
40-
while(Student.objects.get(roll_no=roll).parentId!="root"):
40+
while(Student.objects.get(roll_no=roll).parentId!=None):
4141
student=Student.objects.get(roll_no=roll)
4242
pathObjects.append(student)
4343
roll= student.parentId

backend/family_tree/student/tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class StudentTestCases(GraphQLTestCase):
1111

1212
def setUp(self):
1313
super().setUp()
14-
self.student1 = mixer.blend(Student, name='student1', roll_no='1', parentId='root',year=2019)
14+
self.student1 = mixer.blend(Student, name='student1', roll_no='1', parentId=None,year=2019)
1515
self.student2 = mixer.blend(Student, name='student2', roll_no='2', parentId='1', year=2020)
1616
self.student3 = mixer.blend(Student, name='student3', roll_no='3', parentId='1', year=2020)
1717
self.student4 = mixer.blend(Student, name='student4', roll_no='4', parentId='1', year=2020)

0 commit comments

Comments
 (0)