Skip to content

Commit

Permalink
sonarqube (#39) (#40)
Browse files Browse the repository at this point in the history
  • Loading branch information
mebaysan authored Oct 6, 2023
1 parent 41b78a7 commit e051160
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 30 deletions.
Empty file added .scannerwork/.sonar_lock
Empty file.
6 changes: 6 additions & 0 deletions .scannerwork/report-task.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
projectKey=donation-app
serverUrl=http://172.17.0.3:9000
serverVersion=10.2.1.78527
dashboardUrl=http://172.17.0.3:9000/dashboard?id=donation-app
ceTaskId=AYsEsoW16gqATA3eQGLj
ceTaskUrl=http://172.17.0.3:9000/api/ce/task?id=AYsEsoW16gqATA3eQGLj
18 changes: 8 additions & 10 deletions src/apps/management/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,10 @@ def validate(self, data):

# Password validation
password = data.get("password")
if password:
if len(password) < MIN_PASSWORD_LENGTH:
raise serializers.ValidationError(
f"Parola en az {MIN_PASSWORD_LENGTH} karakter uzunluğunda olmalıdır."
)
if password and len(password) < MIN_PASSWORD_LENGTH:
raise serializers.ValidationError(
f"Parola en az {MIN_PASSWORD_LENGTH} karakter uzunluğunda olmalıdır."
)
return data


Expand All @@ -84,11 +83,10 @@ def validate(self, data):

# Password validation
password = data.get("password")
if password:
if len(password) < MIN_PASSWORD_LENGTH:
raise serializers.ValidationError(
f"Parola en az {MIN_PASSWORD_LENGTH} karakter uzunluğunda olmalıdır."
)
if password and len(password) < MIN_PASSWORD_LENGTH:
raise serializers.ValidationError(
f"Parola en az {MIN_PASSWORD_LENGTH} karakter uzunluğunda olmalıdır."
)
return data


Expand Down
3 changes: 2 additions & 1 deletion src/apps/management/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ def create(self, request, *args, **kwargs):
validated_data = serializer.validated_data
validated_data.pop("confirm_new_password")
try:
user = User.objects.create_user(**validated_data)
# create a new user
User.objects.create_user(**validated_data)
return Response(
{"details": "Kullanıcı başarıyla oluşturuldu."},
status=status.HTTP_201_CREATED,
Expand Down
2 changes: 1 addition & 1 deletion src/apps/management/authentication.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def authenticate(self, request):
payload = jwt.decode(jwt_token, settings.SECRET_KEY, algorithms=["HS256"])
except jwt.exceptions.InvalidSignatureError:
raise AuthenticationFailed("Geçersiz imza.")
except:
except Exception:
raise ParseError()

# Get the user from the database
Expand Down
14 changes: 7 additions & 7 deletions src/apps/management/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ def save(self, *args, **kwargs):
if self.username:
if User.objects.filter(username=self.username).exclude(id=self.id).exists():
raise IntegrityError("Username already exists")
if self.phone_number:
if (
User.objects.filter(phone_number=self.phone_number)
.exclude(id=self.id)
.exists()
):
raise IntegrityError("Phone number already exists")
if (
self.phone_number
and User.objects.filter(phone_number=self.phone_number)
.exclude(id=self.id)
.exists()
):
raise IntegrityError("Phone number already exists")
super().save(*args, **kwargs)

@property
Expand Down
7 changes: 4 additions & 3 deletions src/apps/management/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@


def password_reset(request, uidb64, token):
view_template_name = "management/reset_password.html"
try:
uid = urlsafe_base64_decode(uidb64).decode()
user = User.objects.get(pk=uid)
Expand All @@ -27,7 +28,7 @@ def password_reset(request, uidb64, token):
messages.error(request, "Parolalar eşleşmiyor")
return render(
request,
"management/reset_password.html",
view_template_name,
{
"form": form,
"validlink": True,
Expand All @@ -43,7 +44,7 @@ def password_reset(request, uidb64, token):

return render(
request,
"management/reset_password.html",
view_template_name,
{
"form": form,
"validlink": True,
Expand All @@ -53,7 +54,7 @@ def password_reset(request, uidb64, token):
},
)
else:
return render(request, "management/reset_password.html", {"validlink": False})
return render(request, view_template_name, {"validlink": False})


def password_reset_complete(request):
Expand Down
2 changes: 1 addition & 1 deletion src/apps/payment/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ class Meta:


class PaymentRequestSerializer(serializers.Serializer):
# we sum manually in the provider method to check "amount" field
first_name = serializers.CharField()
last_name = serializers.CharField()
email = serializers.EmailField(validators=[email_regex])
phone_number = serializers.CharField(validators=[phone_regex])
# amount = serializers.FloatField(min_value=0) # we sum manually in the provider method
card_number = serializers.CharField(max_length=19)
card_holder_name = serializers.CharField()
card_expiry = serializers.CharField(max_length=5, validators=[card_expiry_regex])
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/aws/s3.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def get_files_of_folder(bucket_name, file_prefix):
files = [get_presigned_url(bucket_name, file["Key"]) for file in files][
1:
] # the first (0) element is the folder url, not a resource file
except:
except Exception:
# if there is exception, (probably) there is no image to show
files = None

Expand Down
6 changes: 3 additions & 3 deletions src/helpers/payment/factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ def get_payment_provider(cls):
Return Published Payment Provider Class
"""
provider = cls.get_published_payment_provider_instance()
if provider:
if provider.code_name == "KT":
return KuveytTurkPaymentProvider()

if provider.code_name == "KT":
return KuveytTurkPaymentProvider()
return KuveytTurkPaymentProvider() # for now we return KuveytTurk for default

@classmethod
Expand Down
5 changes: 2 additions & 3 deletions src/helpers/payment_provider/factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ def get_payment_provider(cls):
Return Published Payment Provider Class
"""
provider = cls.get_published_payment_provider_instance()
if provider:
if provider.code_name == "KT":
return KuveytTurkPaymentProvider()
if provider.code_name == "KT":
return KuveytTurkPaymentProvider()
return KuveytTurkPaymentProvider() # for now we return KuveytTurk for default

@classmethod
Expand Down

0 comments on commit e051160

Please sign in to comment.