ammar/zod-backend
1
0
Fork 0
mirror of https://github.com/HamzaSha1/zod-backend.git synced 2025-11-27 17:14:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

some changes in artcle api

Browse Source
This commit is contained in:
abutalib-kiwi
2023-07-28 16:08:40 +05:30
parent 151a177e76
commit de774111c0
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web_admin/serializers/article_serializer.py
View File

@ -60,14 +60,14 @@ class ArticleSurveySerializer(serializers.ModelSerializer):
article survey serializer article survey serializer
""" """
id = serializers.IntegerField(required=False) id = serializers.IntegerField(required=False)
survey_options = SurveyOptionSerializer(many=True) options = SurveyOptionSerializer(many=True)
class Meta: class Meta:
""" """
meta class meta class
""" """
model = ArticleSurvey model = ArticleSurvey
fields = ('id', 'question', 'survey_options') fields = ('id', 'question', 'options')
class ArticleSerializer(serializers.ModelSerializer): class ArticleSerializer(serializers.ModelSerializer):
@ -120,7 +120,7 @@ class ArticleSerializer(serializers.ModelSerializer):
for survey in article_survey: for survey in article_survey:
survey = pop_id(survey) survey = pop_id(survey)
options = survey.pop('survey_options') options = survey.pop('options')
survey_obj = ArticleSurvey.objects.create(article=article, points=ARTICLE_SURVEY_POINTS, **survey) survey_obj = ArticleSurvey.objects.create(article=article, points=ARTICLE_SURVEY_POINTS, **survey)
for option in options: for option in options:
option = pop_id(option) option = pop_id(option)
@ -165,7 +165,7 @@ class ArticleSerializer(serializers.ModelSerializer):
# Update or create survey sections # Update or create survey sections
for survey_data in article_survey: for survey_data in article_survey:
survey_id = survey_data.get('id', None) survey_id = survey_data.get('id', None)
options_data = survey_data.pop('survey_options') options_data = survey_data.pop('options')
if survey_id: if survey_id:
survey = ArticleSurvey.objects.get(id=survey_id, article=instance) survey = ArticleSurvey.objects.get(id=survey_id, article=instance)
survey.question = survey_data.get('question', survey.question) survey.question = survey_data.get('question', survey.question)

4
web_admin/serializers/auth_serializer.py
View File

@ -125,12 +125,10 @@ class AdminCreatePasswordSerializer(serializers.ModelSerializer):
if new_password != confirm_password: if new_password != confirm_password:
raise serializers.ValidationError({'details': ERROR_CODE['2065']}) raise serializers.ValidationError({'details': ERROR_CODE['2065']})
user_otp_details = UserEmailOtp.objects.filter(email=email).last() user_otp_details = UserEmailOtp.objects.filter(email=email, is_verified=True).last()
if not user_otp_details: if not user_otp_details:
raise serializers.ValidationError({'details': ERROR_CODE['2064']}) raise serializers.ValidationError({'details': ERROR_CODE['2064']})
if user_otp_details.user_type != dict(USER_TYPE).get('3'): if user_otp_details.user_type != dict(USER_TYPE).get('3'):
raise serializers.ValidationError({'details': ERROR_CODE['2063']}) raise serializers.ValidationError({'details': ERROR_CODE['2063']})
if not user_otp_details.is_verified:
raise serializers.ValidationError({'details': ERROR_CODE['2064']})
user_otp_details.delete() user_otp_details.delete()
return attrs return attrs