Merge pull request #62 from deanblackborough/main

v1.07.0

.env.example

@@ -11,7 +11,9 @@ API_URL_DEV=http://costs.api.app
 ITEM_TYPE_ID=VezyrJyMlk
 ITEM_SUBTYPE_ID=Q6OV9dk5dE
 
-EXCEPTION_NOTIFICATION_EMAIL
+EXCEPTION_NOTIFICATION_EMAIL=
+
+APP_HASH_SALT_FORGOT_PASSWORD=
 
 LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null

README.md

@@ -22,13 +22,13 @@ Our overview is so clear and simple, a child could manage your budget. We wouldn
 
 Simply input your income and outgoings to see projected balances and savings for the months and years ahead. Handy, right?
 
-![Budget overview](/public/images/readme/budget-projections.png)
+![Budget overview](/public/images/readme/view-projections.png)
 
 ## Exclusions
 
 We understand that not all expenses are monthly - we provide the tools to set exclusions, ensuring your budget is completely customisable and up-to-date.
 
-![Budget overview](/public/images/readme/budget-item-exclusions.png)
+![Budget overview](/public/images/readme/set-exclusions.png)
 
 ## Set up
 

app/Actions/Account/ChangePassword.php

@@ -8,7 +8,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class ChangePassword extends Action

app/Actions/Account/DeleteAccount.php

@@ -5,7 +5,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class DeleteAccount

app/Actions/Account/DeleteBudgetAccount.php

@@ -5,7 +5,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class DeleteBudgetAccount

app/Actions/Account/Reset.php

@@ -5,7 +5,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class Reset

app/Actions/Account/UpdateProfile.php

@@ -8,7 +8,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class UpdateProfile extends Action

app/Actions/Action.php

@@ -5,7 +5,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * @license https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 abstract class Action

app/Actions/Budget/Account/Create.php

@@ -11,7 +11,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class Create extends Action

app/Actions/Budget/Account/SetBalances.php

@@ -0,0 +1,81 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Actions\Budget\Account;
+
+use App\Actions\Action;
+use App\Api\Service;
+use Illuminate\Support\Facades\Validator;
+
+/**
+ * @author Dean Blackborough <[email protected]>
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
+ * https://github.com/costs-to-expect/budget/blob/main/LICENSE
+ */
+class SetBalances extends Action
+{
+    public function __invoke(
+        Service $api,
+        string $resource_type_id,
+        string $resource_id,
+        array $input
+    ): int
+    {
+        $resource = $api->getResource($resource_type_id, $resource_id);
+        if ($resource['status'] !== 200) {
+            $this->message = 'Unable to fetch the resource for your Budget, please try again';
+            return $resource['status'];
+        }
+
+        $rules = [];
+        $messages = [];
+
+        $data = $resource['content']['data'] ?? [];
+        foreach ($data['accounts'] as $id => $account) {
+            $rules[$id] = [
+                'required',
+                'string',
+                'regex:/^\d+\.\d{2}$/',
+                'max:16'
+            ];
+            $messages[$id . '.required'] = 'Please enter the balance for the account';
+            $messages[$id . '.regex'] = 'The value should be in the format 0.00';
+            $messages[$id . '.max'] = 'The balance value is too big';
+        }
+
+        Validator::make(
+            $input,
+            $rules,
+            $messages
+        )->validate();
+
+        foreach ($data['accounts'] as $id => $account) {
+            $data['accounts'][$id]['balance'] = $input[$id];
+        }
+
+        try {
+            $data = json_encode($data, JSON_THROW_ON_ERROR);
+        } catch (\JsonException $e) {
+            abort(500, $e->getMessage());
+        }
+
+        $patch_resource_response = $api->patchResource(
+            $resource_type_id,
+            $resource_id,
+            ['data' => $data]
+        );
+
+        if ($patch_resource_response['status'] === 204) {
+            return $patch_resource_response['status'];
+        }
+
+        $this->message = $patch_resource_response['content'];
+
+        if ($patch_resource_response['status'] === 422) {
+            $this->validation_errors = $patch_resource_response['fields'];
+            return $patch_resource_response['status'];
+        }
+
+        return $patch_resource_response['status'];
+    }
+}

app/Actions/Budget/Account/Update.php

@@ -10,7 +10,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class Update extends Action

app/Actions/Budget/AdoptDemo.php

@@ -8,7 +8,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class AdoptDemo extends Action

app/Actions/Budget/Demo.php

@@ -8,7 +8,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class Demo extends Action

app/Actions/Budget/Item/Adjust.php

@@ -9,7 +9,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class Adjust extends Action

app/Actions/Budget/Item/Create.php

@@ -10,7 +10,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class Create extends Action

app/Actions/Budget/Item/Delete.php

@@ -11,7 +11,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class Delete extends Action

app/Actions/Budget/Item/Disable.php

@@ -8,7 +8,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class Disable extends Action

app/Actions/Budget/Item/Enable.php

@@ -8,7 +8,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class Enable extends Action

app/Actions/Budget/Item/Reset.php

@@ -8,7 +8,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class Reset extends Action

app/Actions/Budget/Item/Restore.php

@@ -9,7 +9,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class Restore extends Action

app/Actions/Budget/Item/SetAsNotPaid.php

@@ -8,7 +8,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class SetAsNotPaid extends Action

app/Actions/Budget/Item/SetAsPaid.php

@@ -8,7 +8,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class SetAsPaid extends Action

app/Actions/Budget/Item/Update.php

@@ -10,7 +10,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class Update extends Action

app/Actions/Budget/Start.php

@@ -11,7 +11,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class Start extends Action

app/Actions/Helper.php

@@ -7,7 +7,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * @license https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class Helper

app/Api/Http.php

@@ -8,7 +8,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * @license https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class Http

app/Api/Response.php

@@ -5,7 +5,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * @license https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class Response

app/Api/Service.php

@@ -8,7 +8,7 @@
 
 /**
  * @author Dean Blackborough <[email protected]>
- * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
  * @license https://github.com/costs-to-expect/budget/blob/main/LICENSE
  */
 class Service
@@ -43,6 +43,19 @@ public function authSignIn(string $email, string $password): array
         );
     }
 
+    #[ArrayShape(['status' => "integer", 'content' => "array", 'fields' => "array"])]
+    public function forgotPassword(array $payload): array
+    {
+        $uri = Uri::forgotPassword();
+
+        return $this->http->post(
+            $uri['uri'],
+            [
+                'email' => $payload['email']
+            ]
+        );
+    }
+
     #[ArrayShape(['status' => "integer", 'content' => "array"])]
     public function getAuthUser(): array
     {
@@ -152,6 +165,20 @@ public function createPassword(array $payload): array
         );
     }
 
+    #[ArrayShape(['status' => "integer", 'content' => "array", 'fields' => "array"])]
+    public function createNewPassword(array $payload): array
+    {
+        $uri = Uri::createNewPassword($payload['token'], $payload['email']);
+
+        return $this->http->post(
+            $uri['uri'],
+            [
+                'password' => $payload['password'],
+                'password_confirmation' => $payload['password_confirmation']
+            ]
+        );
+    }
+
     #[ArrayShape(['status' => "integer", 'content' => "array"])]
     public function createResource(string $resource_type_id): array
     {