From e8b3390c4b6bb15080e173b667c024a8ccce9221 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 11 Aug 2020 11:33:43 +1000 Subject: [PATCH 1/3] Remove JSON backups from activities --- app/Helpers/Language/NinjaTranslator.php | 2 -- app/Repositories/ActivityRepository.php | 17 +++-------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/app/Helpers/Language/NinjaTranslator.php b/app/Helpers/Language/NinjaTranslator.php index 50517f903dad..0387a31b1f62 100644 --- a/app/Helpers/Language/NinjaTranslator.php +++ b/app/Helpers/Language/NinjaTranslator.php @@ -20,9 +20,7 @@ class NinjaTranslator extends Translator list($namespace, $group, $item) = $this->parseKey($key); if(null === $locale) - { $locale = $this->locale; - } // Load given group defaults if exists $this->load($namespace, $group, $locale); diff --git a/app/Repositories/ActivityRepository.php b/app/Repositories/ActivityRepository.php index 78394477f995..4bfef9c30d3d 100644 --- a/app/Repositories/ActivityRepository.php +++ b/app/Repositories/ActivityRepository.php @@ -64,12 +64,6 @@ class ActivityRepository extends BaseRepository { $backup = new Backup(); - // if(get_class($entity) == Client::class) - // $settings = $entity->getMergedSettings(); - // else - // $settings = $entity->client->getMergedSettings(); - // $entity->clientMergedDettings = $settings; - if (get_class($entity) == Client::class) { $entity->load('company'); } elseif (get_class($entity) == User::class) { @@ -77,15 +71,10 @@ class ActivityRepository extends BaseRepository $entity->load('company', 'client'); } - - if (get_class($entity) == Invoice::class && ($activity->activity_type_id == Activity::MARK_SENT_INVOICE || $activity->activity_type_id == Activity::PAID_INVOICE)) { - //$backup->html_backup = $this->generateInvoiceHtml($entity->design(), $entity); - $backup->html_backup = $this->generateEntityHtml($entity->getEntityDesigner(), $entity); - } - - + $backup->html_backup = $this->generateEntityHtml($entity->getEntityDesigner(), $entity); $backup->activity_id = $activity->id; - $backup->json_backup = $entity->toJson(); + $backup->json_backup = ''; + //$backup->json_backup = $entity->toJson(); $backup->save(); } From c195f5b8a5c9156ed49732d9ef957839304a9f05 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 11 Aug 2020 13:21:43 +1000 Subject: [PATCH 2/3] Add middleware to destroy document --- app/Http/Controllers/DocumentController.php | 3 +++ app/Http/Middleware/QueryLogging.php | 4 ++-- app/Repositories/ActivityRepository.php | 12 ++++++------ app/Repositories/BaseRepository.php | 1 - routes/api.php | 3 +++ 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/DocumentController.php b/app/Http/Controllers/DocumentController.php index aa81553a9dd1..a1b3a832556d 100644 --- a/app/Http/Controllers/DocumentController.php +++ b/app/Http/Controllers/DocumentController.php @@ -34,6 +34,8 @@ class DocumentController extends BaseController { parent::__construct(); + $this->middleware('password_protected', ['only' => ['destroy']]); + $this->document_repo = $document_repo; } @@ -117,6 +119,7 @@ class DocumentController extends BaseController */ public function destroy(DestroyDocumentRequest $request, Document $document) { + $this->document_repo->delete($document); return response()->json(['message'=>'success']); diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php index 97d214d595b0..0b7f62af8fd5 100644 --- a/app/Http/Middleware/QueryLogging.php +++ b/app/Http/Middleware/QueryLogging.php @@ -50,8 +50,8 @@ class QueryLogging Log::info($request->method() . ' - ' . $request->url() . ": $count queries - " . $time); - // if($count > 700) - // Log::info($queries); + // if($count > 100) + // Log::info($queries); } } diff --git a/app/Repositories/ActivityRepository.php b/app/Repositories/ActivityRepository.php index 4bfef9c30d3d..d7be73171068 100644 --- a/app/Repositories/ActivityRepository.php +++ b/app/Repositories/ActivityRepository.php @@ -64,12 +64,12 @@ class ActivityRepository extends BaseRepository { $backup = new Backup(); - if (get_class($entity) == Client::class) { - $entity->load('company'); - } elseif (get_class($entity) == User::class) { - } else { - $entity->load('company', 'client'); - } + // if (get_class($entity) == Client::class) { + // $entity->load('company'); + // } elseif (get_class($entity) == User::class) { + // } else { + // $entity->load('company', 'client'); + // } $backup->html_backup = $this->generateEntityHtml($entity->getEntityDesigner(), $entity); $backup->activity_id = $activity->id; diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php index e0ef2e08aa4f..02cd86de56ef 100644 --- a/app/Repositories/BaseRepository.php +++ b/app/Repositories/BaseRepository.php @@ -252,7 +252,6 @@ class BaseRepository /* Get array of Keys which have been removed from the invitations array and soft delete each invitation */ $model->invitations->pluck('key')->diff($invitations->pluck('key'))->each(function ($invitation) use($resource){ - // $this->getInvitation($invitation, $resource)->delete(); $invitation_class = sprintf("App\\Models\\%sInvitation", $resource); $invitation = $invitation_class::whereRaw("BINARY `key`= ?", [$invitation])->first(); diff --git a/routes/api.php b/routes/api.php index 2d05c759fe64..f6640a31b5c1 100644 --- a/routes/api.php +++ b/routes/api.php @@ -102,6 +102,9 @@ Route::group(['middleware' => ['api_db', 'token_auth', 'locale'], 'prefix' => 'a Route::post('migration/purge/{company}', 'MigrationController@purgeCompany')->middleware('password_protected'); Route::post('migration/purge_save_settings/{company}', 'MigrationController@purgeCompanySaveSettings')->middleware('password_protected'); + Route::post('companies/purge/{company}', 'MigrationController@purgeCompany')->middleware('password_protected'); + Route::post('companies/purge_save_settings/{company}', 'MigrationController@purgeCompanySaveSettings')->middleware('password_protected'); + Route::post('migration/start/{company}', 'MigrationController@startMigration'); Route::resource('companies', 'CompanyController');// name = (companies. index / create / show / update / destroy / edit From 71449392de9f1ed4d5cebfb3ee30114ae3a5038e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 11 Aug 2020 20:57:45 +1000 Subject: [PATCH 3/3] Fix for regression --- app/Http/Controllers/Auth/LoginController.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index b1fb2a0db629..9cf97b9a6785 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -242,11 +242,14 @@ class LoginController extends BaseController */ public function refresh(Request $request) { - $company_token = CompanyToken::whereRaw("BINARY `token`= ?", [$request->header('X-API-TOKEN')]) - ->first(); + $company_token = CompanyToken::whereRaw("BINARY `token`= ?", [$request->header('X-API-TOKEN')])->first(); + + $cu = CompanyUser::query() + ->where('user_id', $company_token->user_id) + ->where('company_id', $company_token->company_id); //$ct = CompanyUser::whereUserId(auth()->user()->id); - return $this->refreshResponse($company_token->company_user()); + return $this->refreshResponse($cu); } /**