diff --git a/dal/db_query/queries.sql b/dal/db_query/queries.sql index f09ed79..ac1e937 100644 --- a/dal/db_query/queries.sql +++ b/dal/db_query/queries.sql @@ -684,7 +684,6 @@ tokend AS ( ) SELECT * FROM tokend; - -- name: SoftDeleteAccount :exec UPDATE users SET Deleted = TRUE WHERE AccountID = $1; @@ -730,7 +729,7 @@ ORDER BY f.ID OFFSET ($2 - 1) * $3 LIMIT $3; -- name: UpdateTags :exec UPDATE tags AS t -SET name = (update_data ->> 'Name')::varchar(1024), +SET name = (update_data ->> 'Name')::varchar(512), color = (update_data ->> 'Color')::varchar(50), createdAt = CURRENT_TIMESTAMP FROM json_array_elements($1::json) AS update_data @@ -740,7 +739,7 @@ WHERE t.amoID = (update_data ->> 'AmoID')::INT -- name: UpdatePipelines :exec UPDATE pipelines AS p -SET name = (update_data ->> 'Name')::varchar(1024), +SET name = (update_data ->> 'Name')::varchar(512), isArchive = CASE WHEN (update_data ->> 'IsArchive') = 'true' THEN TRUE ELSE FALSE END, createdAt = CURRENT_TIMESTAMP FROM json_array_elements($1::json) AS update_data @@ -749,7 +748,7 @@ WHERE p.amoID = (update_data ->> 'AmoID')::INT -- name: UpdateSteps :exec UPDATE steps AS s -SET name = (update_data ->> 'Name')::varchar(1024), +SET name = (update_data ->> 'Name')::varchar(512), color = (update_data ->> 'Color')::varchar(50), createdAt = CURRENT_TIMESTAMP FROM json_array_elements($1::json) AS update_data @@ -759,7 +758,7 @@ WHERE s.amoID = (update_data ->> 'AmoID')::INT -- name: UpdateFields :exec UPDATE fields AS f -SET name = (update_data ->> 'Name')::varchar(1024), +SET name = (update_data ->> 'Name')::varchar(512), code = (update_data ->> 'Code')::varchar(255), type = (update_data ->> 'Type')::fieldtype, createdAt = CURRENT_TIMESTAMP @@ -776,7 +775,7 @@ WITH user_data AS ( ), new_tags AS ( SELECT (tag->>'AmoID')::INT AS amoID, (tag->>'Entity')::entitytype AS Entity, - COALESCE(tag->>'Name', '')::VARCHAR(1024) AS name, + COALESCE(tag->>'Name', '')::VARCHAR(512) AS name, COALESCE(tag->>'Color', '')::VARCHAR(50) AS color FROM json_array_elements($2::json) AS tag ), inserted_tags AS ( @@ -806,7 +805,7 @@ WHERE NOT EXISTS ( WITH new_pipelines AS ( SELECT (pipeline->>'AmoID')::INT AS amoID, (pipeline->>'AccountID')::INT AS accountID, - COALESCE(pipeline->>'Name', '')::varchar(1024) AS name, + COALESCE(pipeline->>'Name', '')::varchar(512) AS name, CASE WHEN (pipeline->>'IsArchive') = 'true' THEN TRUE ELSE FALSE END AS isArchive, CURRENT_TIMESTAMP AS createdAt FROM json_array_elements($1::json) AS pipeline @@ -837,7 +836,7 @@ WITH user_data AS ( ), new_fields AS ( SELECT (field->>'AmoID')::INT AS amoID, COALESCE(field->>'Code', '')::varchar(255) AS code, - COALESCE(field->>'Name', '')::varchar(1024) AS name, + COALESCE(field->>'Name', '')::varchar(512) AS name, CAST(field->>'Entity' AS entitytype) AS Entity, COALESCE(field->>'Type', '')::fieldtype AS type, CURRENT_TIMESTAMP AS createdAt @@ -871,7 +870,7 @@ WITH new_steps AS ( SELECT (step->>'AmoID')::INT AS amoID, (step->>'PipelineID')::INT AS pipelineID, (step->>'AccountID')::INT AS accountID, - COALESCE(step->>'Name', '')::varchar(1024) AS name, + COALESCE(step->>'Name', '')::varchar(512) AS name, COALESCE(step->>'Color', '')::varchar(50) AS color, CURRENT_TIMESTAMP AS createdAt FROM json_array_elements($1::json) AS step @@ -923,7 +922,7 @@ WITH user_data AS ( ), new_UTMs AS ( SELECT (utm->>'AmoFieldID')::INT AS amoFieldID, COALESCE(utm->>'QuizID', '')::INT AS quizID, - COALESCE(utm->>'Name', '')::varchar(1024) AS name, + COALESCE(utm->>'Name', '')::varchar(512) AS name, CURRENT_TIMESTAMP AS createdAt FROM json_array_elements($2::json) AS utm ), inserted_utms AS( @@ -965,7 +964,7 @@ WHERE AccountID = $1; -- name: UpdateUtms :exec UPDATE utms AS u -SET name = (update_data ->> 'Name')::varchar(1024), +SET name = (update_data ->> 'Name')::varchar(512), AmoFieldID = (update_data ->> 'AmoFieldID')::INT FROM json_array_elements($1::json) AS update_data WHERE u.ID = (update_data ->> 'ID')::INT; diff --git a/dal/schema/000010_init.up.sql b/dal/schema/000010_init.up.sql index b86c131..3a4db3c 100644 --- a/dal/schema/000010_init.up.sql +++ b/dal/schema/000010_init.up.sql @@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS users ( ID BIGSERIAL UNIQUE NOT NULL PRIMARY KEY, AccountID VARCHAR(30) NOT NULL DEFAULT '', -- id квизе из токена AmoID INT NOT NULL , -- id в амо - Name VARCHAR(1024) NOT NULL DEFAULT '', -- имя в амо + Name VARCHAR(512) NOT NULL DEFAULT '', -- имя в амо Email VARCHAR(50) NOT NULL DEFAULT '', -- почта в амо Role INT NOT NULL DEFAULT 0, -- роль в амо "Group" INT NOT NULL DEFAULT 0, -- вложенная структура так как в амо группы хранятся массивом структур @@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS pipelines ( ID BIGSERIAL UNIQUE NOT NULL PRIMARY KEY, AmoID INT NOT NULL , --id воронки в амо AccountID INT NOT NULL , --id аккаунта в амо связь с таблицей users AmoID неявная посредством join - Name VARCHAR(1024) NOT NULL DEFAULT '', --название воронки в амо + Name VARCHAR(512) NOT NULL DEFAULT '', --название воронки в амо IsArchive BOOLEAN NOT NULL DEFAULT FALSE, --флаг архивной воронки в амо Deleted BOOLEAN NOT NULL DEFAULT FALSE, CreatedAt TIMESTAMP DEFAULT CURRENT_TIMESTAMP @@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS steps ( AmoID INT NOT NULL, --id шага воронки в амо PipelineID INT NOT NULL, --id воронки AmoID pipelines неявная посредством join AccountID INT NOT NULL, --id аккаунта в амо связь с таблицей users AmoID неявная посредством join - Name VARCHAR(1024) NOT NULL DEFAULT '', --название воронки в амо + Name VARCHAR(512) NOT NULL DEFAULT '', --название воронки в амо Color VARCHAR(50) NOT NULL DEFAULT '', --цвет шага в амо* Deleted BOOLEAN NOT NULL DEFAULT FALSE, CreatedAt TIMESTAMP DEFAULT CURRENT_TIMESTAMP @@ -61,7 +61,7 @@ CREATE TABLE IF NOT EXISTS fields ( AmoID INT NOT NULL, -- айдишник кастомного поля в амо Code VARCHAR(255) NOT NULL DEFAULT '', -- кодовое слово в амо AccountID INT NOT NULL, -- id аккаунта в амо связь с таблицей users AmoID неявная посредством join - Name VARCHAR(1024) NOT NULL DEFAULT '', -- название воронки в амо + Name VARCHAR(512) NOT NULL DEFAULT '', -- название воронки в амо Entity EntityType NOT NULL, -- тип сущности в амо, для которой это кастомное поле Type FieldType NOT NULL, -- тип поля Deleted BOOLEAN NOT NULL DEFAULT FALSE, @@ -73,7 +73,7 @@ CREATE TABLE IF NOT EXISTS tags ( AmoID INT NOT NULL, -- айдишник тега в амо AccountID INT NOT NULL, -- id аккаунта в амо связь с таблицей users AmoID неявная посредством join Entity EntityType NOT NULL, -- сущность, к которой принадлежит этот тег - Name VARCHAR(1024) NOT NULL DEFAULT '', -- название тега в амо + Name VARCHAR(512) NOT NULL DEFAULT '', -- название тега в амо Color VARCHAR(50) NOT NULL DEFAULT '', -- цвет тега в амо Deleted BOOLEAN NOT NULL DEFAULT FALSE, CreatedAt TIMESTAMP DEFAULT CURRENT_TIMESTAMP @@ -84,7 +84,7 @@ CREATE TABLE IF NOT EXISTS utms ( AmoFieldID INT NOT NULL DEFAULT 0, -- id field в амо QuizID INT NOT NULL, -- id опроса AccountID INT NOT NULL, -- id аккаунта в амо AMOID - Name VARCHAR(1024) NOT NULL DEFAULT '', -- название utm + Name VARCHAR(512) NOT NULL DEFAULT '', -- название utm Deleted BOOLEAN NOT NULL DEFAULT FALSE, CreatedAt TIMESTAMP DEFAULT CURRENT_TIMESTAMP );