Sourcery refactored master branch by sourcery-ai[bot] · Pull Request #1 · szepix/Car-rental-system-python

sourcery-ai · 2021-09-10T07:38:54Z

Branch master refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the master branch, then run:

git fetch origin sourcery/master
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai · 2021-09-10T07:45:41Z

car_rental.py

                    raise InvalidDateRange
-            except ValueError:
-                raise InvalidDate
-            except AttributeError:
+            except (ValueError, AttributeError):
                raise InvalidDate


Function Reservation.__init__ refactored with the following changes:

Merge except handlers with identical code blocks (merge-except-handler)

sourcery-ai · 2021-09-10T07:45:41Z

car_rental.py

-        except ValueError:
-            raise InvalidDate
-        except AttributeError:
+        except (ValueError, AttributeError):


Function Rent.__init__ refactored with the following changes:

Merge except handlers with identical code blocks (merge-except-handler)

sourcery-ai · 2021-09-10T07:45:42Z

car_rental_io.py

            }

-        if type == "Van":
+        elif type == "Van":


Function cars_as_dict refactored with the following changes:

Simplify conditional into switch-like form (switch)

sourcery-ai · 2021-09-10T07:45:42Z

database_actions.py

-    overdue = []
    if cars:
+        overdue = []


Function overdue_cars refactored with the following changes:

Move assignments closer to their usage (move-assign)

sourcery-ai · 2021-09-10T07:45:42Z

database_actions.py

    cars_as_list = cars_as_dict(cars)
-    if len(criteria) != 0:
-        for car in cars_as_list:
-            criteria_met = 0
-            criteria_size = len(criteria)
-            for crit_name in criteria:
-                crit = criteria[crit_name]
-                car_crit = car[crit_name]
-                if isinstance(crit, dict):
-                    if crit_name == 'Rent':
-                        if car_crit is not None and crit['Return date'] is not None:
-                            car_date = datetime.strptime(car_crit['Return date'], '%d.%m.%Y').date()
-                            crit_date = datetime.strptime(crit['Return date'], '%d.%m.%Y').date()
-                        if car_crit is None or crit['Return date'] is None or car_date < crit_date:
-                            criteria_met += 1
-                        continue
-                    if crit_name == 'Reservation':
-                        if car_crit is not None and crit['Due Reservation Date'] is not None:
-                            car_date = datetime.strptime(car_crit['Due Reservation Date'], '%d.%m.%Y').date()
-                            crit_date = datetime.strptime(crit['Due Reservation Date'], '%d.%m.%Y').date()
-                        if car_crit is None or crit['Due Reservation Date'] is None or car_date < crit_date:
-                            criteria_met += 1
-                        continue
+    if len(criteria) == 0:
+        return []

-                    criteria_size += len(crit)
-                    for add in crit:
-                        if crit[add] != '':
-                            try:
-                                if crit[add] == car_crit[add] or crit[add] == '':
-                                    criteria_met += 1
-                            except Exception:
-                                pass
-                        else:
-                            criteria_met += 1
-                    criteria_met += 1
-                else:
-                    if crit == car_crit or crit == '':
+    criteria_meeting = []
+    for car_index, car in enumerate(cars_as_list):
+        criteria_met = 0
+        criteria_size = len(criteria)
+        for crit_name in criteria:
+            crit = criteria[crit_name]
+            car_crit = car[crit_name]
+            if isinstance(crit, dict):
+                if crit_name == 'Rent':
+                    if car_crit is not None and crit['Return date'] is not None:
+                        car_date = datetime.strptime(car_crit['Return date'], '%d.%m.%Y').date()
+                        crit_date = datetime.strptime(crit['Return date'], '%d.%m.%Y').date()
+                    if car_crit is None or crit['Return date'] is None or car_date < crit_date:
                        criteria_met += 1
-            if(criteria_met == criteria_size):
-                car_class = cars[car_index]
-                criteria_meeting.append(car_class)
-            car_index += 1
-        return criteria_meeting
-    else:
-        return []
+                    continue
+                if crit_name == 'Reservation':
+                    if car_crit is not None and crit['Due Reservation Date'] is not None:
+                        car_date = datetime.strptime(car_crit['Due Reservation Date'], '%d.%m.%Y').date()
+                        crit_date = datetime.strptime(crit['Due Reservation Date'], '%d.%m.%Y').date()
+                    if car_crit is None or crit['Due Reservation Date'] is None or car_date < crit_date:
+                        criteria_met += 1
+                    continue
+
+                criteria_size += len(crit)
+                for add in crit:
+                    if crit[add] != '':
+                        try:
+                            if crit[add] == car_crit[add]:
+                                criteria_met += 1
+                        except Exception:
+                            pass
+                    else:
+                        criteria_met += 1
+                criteria_met += 1
+            elif crit in [car_crit, '']:
+                criteria_met += 1
+        if(criteria_met == criteria_size):
+            car_class = cars[car_index]
+            criteria_meeting.append(car_class)
+    return criteria_meeting


Function search_database refactored with the following changes:

Remove redundant conditional (remove-redundant-if)

Replace multiple comparisons of same variable with in operator (merge-comparisons)

Move assignments closer to their usage (move-assign)

Replace manual loop counter with call to enumerate (convert-to-enumerate)

Swap if/else branches (swap-if-else-branches)

Remove unnecessary else after guard condition (remove-unnecessary-else)

Merge else clause's nested if statement into elif (merge-else-if-into-elif)

sourcery-ai · 2021-09-10T07:45:42Z

gui.py

-            self.cars = read_from_database()
-        else:
-            self.cars = []
+        self.cars = read_from_database() or []


Function CarRentalWindow.__init__ refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

Simplify if expression by using or (or-if-exp-identity)

sourcery-ai · 2021-09-10T07:45:42Z

gui.py

-            if car.reservation:
-                if car.reservation.check_expiration() == "EXPIRED":
-                    car.reservation = None
+            if car.reservation and car.reservation.check_expiration() == "EXPIRED":
+                car.reservation = None


Function CarRentalWindow.check_reservations refactored with the following changes:

Merge nested if conditions (merge-nested-ifs)

sourcery-ai · 2021-09-10T07:45:45Z

Sourcery Code Quality Report

✅ Merging this PR will increase code quality in the affected files by 0.65%.

Quality metrics	Before	After	Change
Complexity	15.03 🙂	12.76 🙂	-2.27 👍
Method Length	80.51 🙂	80.05 🙂	-0.46 👍
Working memory	10.93 😞	10.75 😞	-0.18 👍
Quality	53.99% 🙂	54.64% 🙂	0.65% 👍

Other metrics	Before	After	Change
Lines	710	699	-11

Changed files	Quality Before	Quality After	Quality Change
car_rental.py	74.23% 🙂	75.31% ⭐	1.08% 👍
car_rental_io.py	40.53% 😞	40.95% 😞	0.42% 👍
database_actions.py	42.02% 😞	45.06% 😞	3.04% 👍
gui.py	55.95% 🙂	55.99% 🙂	0.04% 👍

Here are some functions in these files that still need a tune-up:

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
database_actions.py	search_database	64 ⛔	221 ⛔	17 ⛔	15.03% ⛔	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
gui.py	CarRentalWindow.set_text	31 😞	231 ⛔	10 😞	31.97% 😞	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
car_rental_io.py	read_from_json	11 🙂	223 ⛔	19 ⛔	34.58% 😞	Try splitting into smaller methods. Extract out complex expressions
gui.py	CarRentalWindow._reserve_rent	17 🙂	242 ⛔	13 😞	34.83% 😞	Try splitting into smaller methods. Extract out complex expressions
gui.py	CarRentalWindow.edit_add_to_database	8 ⭐	187 😞	18 ⛔	40.73% 😞	Try splitting into smaller methods. Extract out complex expressions

Legend and Explanation

The emojis denote the absolute quality of the code:

⭐ excellent
🙂 good
😞 poor
⛔ very poor

The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request.

Please see our documentation here for details on how these metrics are calculated.

We are actively working on this report - lots more documentation and extra metrics to come!

Help us improve this quality report!

sourcery-ai bot requested a review from szepix September 10, 2021 07:38

sourcery-ai bot force-pushed the sourcery/master branch 12 times, most recently from d268b71 to b85e299 Compare September 10, 2021 07:44

'Refactored by Sourcery'

28e5819

sourcery-ai bot force-pushed the sourcery/master branch from b85e299 to 28e5819 Compare September 10, 2021 07:45

sourcery-ai bot commented Sep 10, 2021

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery refactored master branch#1

Sourcery refactored master branch#1
sourcery-ai[bot] wants to merge 1 commit intomasterfrom
sourcery/master

sourcery-ai bot commented Sep 10, 2021

Uh oh!

sourcery-ai bot Sep 10, 2021

Uh oh!

sourcery-ai bot Sep 10, 2021

Uh oh!

sourcery-ai bot Sep 10, 2021

Uh oh!

sourcery-ai bot Sep 10, 2021

Uh oh!

sourcery-ai bot Sep 10, 2021

Uh oh!

sourcery-ai bot Sep 10, 2021

Uh oh!

sourcery-ai bot Sep 10, 2021

Uh oh!

sourcery-ai bot commented Sep 10, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

0 participants

Conversation

sourcery-ai bot commented Sep 10, 2021

Uh oh!

sourcery-ai bot Sep 10, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Sep 10, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Sep 10, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Sep 10, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Sep 10, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Sep 10, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Sep 10, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot commented Sep 10, 2021

Sourcery Code Quality Report

Legend and Explanation

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

0 participants