mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-05-31 05:54:38 -04:00
Migrations fixes (#3086)
* working on email throttling * Fixes for migrations
This commit is contained in:
parent
ad87287fa7
commit
170340cdfa
@ -80,7 +80,7 @@ class MigrationController extends BaseController
|
|||||||
public function purgeCompany(Company $company)
|
public function purgeCompany(Company $company)
|
||||||
{
|
{
|
||||||
|
|
||||||
$company->delete();
|
$company->delete();
|
||||||
|
|
||||||
return response()->json(['message'=>'Company purged'], 200);
|
return response()->json(['message'=>'Company purged'], 200);
|
||||||
}
|
}
|
||||||
@ -133,8 +133,8 @@ class MigrationController extends BaseController
|
|||||||
*/
|
*/
|
||||||
public function purgeCompanySaveSettings(Company $company)
|
public function purgeCompanySaveSettings(Company $company)
|
||||||
{
|
{
|
||||||
$company->client->delete()
|
$company->client->delete();
|
||||||
$company->save()
|
$company->save();
|
||||||
|
|
||||||
return response()->json(['message'=>'Setting preserved'], 200);
|
return response()->json(['message'=>'Setting preserved'], 200);
|
||||||
|
|
||||||
|
@ -30,6 +30,7 @@ use App\Models\TaxRate;
|
|||||||
use App\Models\Timezone;
|
use App\Models\Timezone;
|
||||||
use App\Models\Traits\AccountTrait;
|
use App\Models\Traits\AccountTrait;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
|
use App\Utils\Ninja;
|
||||||
use App\Utils\Traits\CompanySettingsSaver;
|
use App\Utils\Traits\CompanySettingsSaver;
|
||||||
use App\Utils\Traits\MakesHash;
|
use App\Utils\Traits\MakesHash;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
@ -246,4 +247,49 @@ class Company extends BaseModel
|
|||||||
return $this
|
return $this
|
||||||
->where('id', $this->decodePrimaryKey($value))->firstOrFail();
|
->where('id', $this->decodePrimaryKey($value))->firstOrFail();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private function isThrottled()
|
||||||
|
{
|
||||||
|
if (Ninja::isSelfHost()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$key = $this->id;
|
||||||
|
|
||||||
|
// http://stackoverflow.com/questions/1375501/how-do-i-throttle-my-sites-api-users
|
||||||
|
$day = 60 * 60 * 24;
|
||||||
|
$day_limit = $account->getDailyEmailLimit();
|
||||||
|
$day_throttle = Cache::get("email_day_throttle:{$key}", null);
|
||||||
|
$last_api_request = Cache::get("last_email_request:{$key}", 0);
|
||||||
|
$last_api_diff = time() - $last_api_request;
|
||||||
|
|
||||||
|
if (is_null($day_throttle)) {
|
||||||
|
$new_day_throttle = 0;
|
||||||
|
} else {
|
||||||
|
$new_day_throttle = $day_throttle - $last_api_diff;
|
||||||
|
$new_day_throttle = $new_day_throttle < 0 ? 0 : $new_day_throttle;
|
||||||
|
$new_day_throttle += $day / $day_limit;
|
||||||
|
$day_hits_remaining = floor(($day - $new_day_throttle) * $day_limit / $day);
|
||||||
|
$day_hits_remaining = $day_hits_remaining >= 0 ? $day_hits_remaining : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
Cache::put("email_day_throttle:{$key}", $new_day_throttle, 60);
|
||||||
|
Cache::put("last_email_request:{$key}", time(), 60);
|
||||||
|
|
||||||
|
if ($new_day_throttle > $day) {
|
||||||
|
$errorEmail = env('ERROR_EMAIL');
|
||||||
|
if ($errorEmail && ! Cache::get("throttle_notified:{$key}")) {
|
||||||
|
Mail::raw('Account Throttle: ' . $account->account_key, function ($message) use ($errorEmail, $account) {
|
||||||
|
$message->to($errorEmail)
|
||||||
|
->from(CONTACT_EMAIL)
|
||||||
|
->subject("Email throttle triggered for account " . $account->id);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Cache::put("throttle_notified:{$key}", true, 60 * 24);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -198,7 +198,7 @@ class CreateUsersTable extends Migration
|
|||||||
|
|
||||||
$table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
|
$table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
|
||||||
$table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
|
$table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
|
||||||
$table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
|
// $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
|
||||||
|
|
||||||
$table->index(['account_id', 'company_id']);
|
$table->index(['account_id', 'company_id']);
|
||||||
|
|
||||||
@ -259,7 +259,7 @@ class CreateUsersTable extends Migration
|
|||||||
|
|
||||||
$table->unique(['oauth_user_id', 'oauth_provider_id']);
|
$table->unique(['oauth_user_id', 'oauth_provider_id']);
|
||||||
|
|
||||||
$table->foreign('user_id')->references('user_id')->on('company_users')->onDelete('cascade');
|
// $table->foreign('user_id')->references('user_id')->on('company_users')->onDelete('cascade');
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user