fix: env vars handled via conf file, add: functional tests

This commit is contained in:
Michael 2024-08-17 18:06:06 +02:00
parent 3d08b14f11
commit 21c4330f16
39 changed files with 416 additions and 172 deletions

View file

@ -15,9 +15,9 @@ class EmailService extends Controller
public function __construct()
{
$this->email_address_recepient = env('EMAIL_ADDRESS_RECEPIENT', null);
$this->email_prefix_subject = env('EMAIL_PREFIX_SUBJECT', null);
$this->nextcloud_upload_folder_web_link = env('NEXTCLOUD_UPLOAD_FOLDER_WEB_LINK', false);
$this->email_address_recepient = config('mail.email_address_recepient', null);
$this->email_prefix_subject = config('mail.email_prefix_subject', null);
$this->nextcloud_upload_folder_web_link = config('mail.nextcloud_upload_folder_web_link', false);
}
function send_export_via_email(string $from_date, string $to_date, string $file_name){
try{

View file

@ -17,11 +17,11 @@ class NextcloudService extends Controller
public function __construct()
{
$this->nextcloud_url = env('NEXTCLOUD_URL', false);
$this->nextcloud_user = env('NEXTCLOUD_USER', false);
$this->nextcloud_password = env('NEXTCLOUD_PASSWORD', false);
$this->nextcloud_upload_folder_path = env('NEXTCLOUD_UPLOAD_FOLDER_PATH', false);
$this->nextcloud_upload_folder_web_link = env('NEXTCLOUD_UPLOAD_FOLDER_WEB_LINK', false);
$this->nextcloud_url = config('app.nextcloud_url', false);
$this->nextcloud_user = config('app.nextcloud_user', false);
$this->nextcloud_password = config('app.nextcloud_password', false);
$this->nextcloud_upload_folder_path = config('app.nextcloud_upload_folder_path', false);
$this->nextcloud_upload_folder_web_link = config('app.nextcloud_upload_folder_web_link', false);
}
function nextcloud_upload_csv(string $file_name, string $file_path)

View file

@ -17,14 +17,14 @@ class OpenProjectService extends Controller
public function __construct()
{
$this->open_project_url = env('OPEN_PROJECT_URL', false);
$this->open_project_token = env('OPEN_PROJECT_TOKEN', false);
$this->open_project_project_id = env('OPEN_PROJECT_PROJECT_ID', false);
$this->open_project_task_name = env('OPEN_PROJECT_TASK_NAME', false);
$this->open_project_group_id = env('OPEN_PROJECT_GROUP_ID', false);
$this->open_project_special_nicks_list = env('OPEN_PROJECT_SPECIAL_NICKS_LIST', false);
$this->open_project_work_package_type_id = env('OPEN_PROJECT_WORK_PACKAGE_TYPE_ID', false);
$this->open_project_work_package_user_owner_id = env('OPEN_PROJECT_WORK_PACKAGE_USER_OWNER_ID', false);
$this->open_project_url = config('app.open_project_url', false);
$this->open_project_token = config('app.open_project_token', false);
$this->open_project_project_id = config('app.open_project_project_id', false);
$this->open_project_task_name = config('app.open_project_task_name', false);
$this->open_project_group_id = config('app.open_project_group_id', false);
$this->open_project_special_nicks_list = config('app.open_project_special_nicks_list', false);
$this->open_project_work_package_type_id = config('app.open_project_work_package_type_id', false);
$this->open_project_work_package_user_owner_id = config('app.open_project_work_package_user_owner_id', false);
}
private function open_project_project_member_task_id(stdClass $open_project_member)

View file

@ -12,15 +12,15 @@ class ThirdPartyServices extends Controller
private $third_party_integrations_nextcloud;
private $third_party_integrations_open_project;
public function __construct()
public function __construct($third_party_integrations_nextcloud, $third_party_integrations_open_project, $email_send_allow)
{
$this->third_party_integrations_nextcloud = env('THIRD_PARTY_INTEGRATIONS_NEXTCLOUD', false);
$this->third_party_integrations_open_project = env('THIRD_PARTY_INTEGRATIONS_OPEN_PROJECT', false);
$this->email_send_allow = env('EMAIL_SEND_ALLOW', false);
$this->third_party_integrations_nextcloud = $third_party_integrations_nextcloud || config('app.third_party_integrations_nextcloud', false);
$this->third_party_integrations_open_project = $third_party_integrations_open_project || config('app.third_party_integrations_open_project', false);
$this->email_send_allow = $email_send_allow || config('email.email_send_allow', false);
$this->nextcloud_service = new \App\Http\Controllers\ThirdPartyServices\NextcloudService();
$this->open_project_service = new \App\Http\Controllers\ThirdPartyServices\OpenProjectService();
$this->email_service = new \App\Http\Controllers\ThirdPartyServices\EmailService();
$this->calculate_agent_cost = env('GITEA_CALCULATE_AGENT_COST', false);
$this->calculate_agent_cost = config('app.gitea_calculate_agent_cost', false);
}
function handle_third_party_services(string $file_name, string $file_path, array $issues, array $company_agents, string $from_date, string $to_date)