From 5cff2eadace008510e2c5d70090d738385a3e0a6 Mon Sep 17 00:00:00 2001 From: KarlsonComplete Date: Sun, 6 Oct 2024 18:51:03 +0300 Subject: [PATCH 1/3] =?UTF-8?q?-=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B3=D0=BB=D0=BE=D0=B1=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B?= =?UTF-8?q?=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B?= =?UTF-8?q?=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/postgres/Dockerfile | 17 +++++++++++++---- index.php | 5 ++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile index 8d7a370..3c4041e 100644 --- a/docker/postgres/Dockerfile +++ b/docker/postgres/Dockerfile @@ -1,12 +1,21 @@ FROM postgres:16.4-alpine +# Определяем ARG переменные, которые будут переданы при сборке +ARG POSTGRES_USER +ARG POSTGRES_PASSWORD +ARG POSTGRES_DB + # Устанавливаем переменные окружения для настройки базы данных -ENV POSTGRES_USER=kirill -ENV POSTGRES_PASSWORD=bitrix24lib -ENV POSTGRES_DB=bitrixAppDb +ENV POSTGRES_USER=${POSTGRES_USER} +ENV POSTGRES_PASSWORD=${POSTGRES_PASSWORD} +ENV POSTGRES_DB=${POSTGRES_DB} # Копируем SQL-скрипты для инициализации базы данных (если есть) # COPY init.sql /docker-entrypoint-initdb.d/ # Открываем порт PostgreSQL -EXPOSE 5432 \ No newline at end of file +EXPOSE 5432 + + + + diff --git a/index.php b/index.php index b70805a..c69b486 100644 --- a/index.php +++ b/index.php @@ -1,7 +1,10 @@ "; -$conn_string = "pgsql:host=localhost;port=5432;dbname=bitrixAppDb;user=kirill;password=bitrix24lib"; +$dbName = getenv('POSTGRES_DB'); +$dbPassword = getenv('POSTGRES_PASSWORD'); +$dbUser = getenv('POSTGRES_USER'); +$conn_string = "pgsql:host=localhost;port=5432;dbname=$dbUser;user=$dbUser;password=$dbPassword"; try { $db = new PDO($conn_string); From cd2d4600c0c272b1637a8dd95a94495d55bbed7c Mon Sep 17 00:00:00 2001 From: KarlsonComplete Date: Sat, 12 Oct 2024 10:41:49 +0300 Subject: [PATCH 2/3] =?UTF-8?q?-=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BC=D0=B0=D0=BF=D0=B8=D0=BD=D0=B3=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=BB=D0=B1=D1=86=D1=8B:=20isBitrix24UserAdm?= =?UTF-8?q?in,domain=5Furl,updatedAt,applicationVersion.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Bitrix24Accounts/Entity/Bitrix24Account.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Bitrix24Accounts/Entity/Bitrix24Account.php b/src/Bitrix24Accounts/Entity/Bitrix24Account.php index 247e9fd..df96221 100644 --- a/src/Bitrix24Accounts/Entity/Bitrix24Account.php +++ b/src/Bitrix24Accounts/Entity/Bitrix24Account.php @@ -62,18 +62,26 @@ public function __construct( #[ORM\Column(name: 'b24_user_id', type: 'integer', nullable: false)] #[SerializedName('b24_user_id')] private readonly int $bitrix24UserId, + #[ORM\Column(name: 'is_b24_user_admin', type: 'boolean', nullable: false)] + #[SerializedName('is_b24_user_admin')] private readonly bool $isBitrix24UserAdmin, /** bitrix24 portal unique id */ #[ORM\Column(name: 'member_id', type: 'string', nullable: false)] #[SerializedName('member_id')] private readonly string $memberId, + #[ORM\Column(name: 'domain_url', type: 'string', nullable: false)] + #[SerializedName('domain_url')] private string $domainUrl, private Bitrix24AccountStatus $accountStatus, AuthToken $authToken, #[ORM\Column(name: 'created_at_utc', type: 'carbon_immutable', precision: 3, nullable: false)] #[Ignore] private readonly CarbonImmutable $createdAt, + #[ORM\Column(name: 'update_at_utc', type: 'carbon_immutable', precision: 3, nullable: false)] + #[Ignore] private CarbonImmutable $updatedAt, + #[ORM\Column(name: 'application_version', type: 'integer', nullable: false)] + #[Ignore] private int $applicationVersion, Scope $applicationScope, ) From 01ad5089fe41e80118d72ff56e47f10aabeefdcf Mon Sep 17 00:00:00 2001 From: KarlsonComplete Date: Sun, 13 Oct 2024 17:55:19 +0300 Subject: [PATCH 3/3] =?UTF-8?q?-=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BC=D0=B0=D0=BF=D0=B8=D0=BD=D0=B3=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=BB=D0=B1=D0=B5=D1=86:=20accountStatus.=20?= =?UTF-8?q?-=20=D0=9F=D1=8B=D1=82=D0=B0=D0=BB=D1=81=D1=8F=20=D0=B5=D1=89?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20?= =?UTF-8?q?=D0=BD=D0=B0=20authToken.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Bitrix24Accounts/Entity/Bitrix24Account.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Bitrix24Accounts/Entity/Bitrix24Account.php b/src/Bitrix24Accounts/Entity/Bitrix24Account.php index df96221..772955c 100644 --- a/src/Bitrix24Accounts/Entity/Bitrix24Account.php +++ b/src/Bitrix24Accounts/Entity/Bitrix24Account.php @@ -72,8 +72,10 @@ public function __construct( #[ORM\Column(name: 'domain_url', type: 'string', nullable: false)] #[SerializedName('domain_url')] private string $domainUrl, + #[ORM\Column(name: 'account_status', type: 'string', nullable: false, enumType: Bitrix24AccountStatus::class)] private Bitrix24AccountStatus $accountStatus, - AuthToken $authToken, + #[ORM\Embedded(class: AuthToken::class)] + AuthToken $authToken, #[ORM\Column(name: 'created_at_utc', type: 'carbon_immutable', precision: 3, nullable: false)] #[Ignore] private readonly CarbonImmutable $createdAt,