Skip to content

Commit

Permalink
Преобразование OPI -> OInt (workflow)
Browse files Browse the repository at this point in the history
  • Loading branch information
@VitalyTheAlpaca
VitalyTheAlpaca committed Jul 14, 2024
1 parent 43dba15 commit eef4f58
Show file tree
Hide file tree
Showing 13 changed files with 4,151 additions and 4,101 deletions.
7,890 changes: 3,945 additions & 3,945 deletions service/dictionaries/en.json
View file

Large diffs are not rendered by default.

97 changes: 57 additions & 40 deletions src/en/OInt/core/Modules/OPI_Bitrix24.os
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
// BSLLS:IncorrectLineBreak-off
// BSLLS:NumberOfOptionalParams-off
// BSLLS:UsingServiceTag-off
// BSLLS:LineLength-off

//@skip-check module-structure-top-region
//@skip-check module-structure-method-in-regions
Expand Down Expand Up @@ -511,7 +512,6 @@ EndFunction
// Method at API documentation: [tasks.task.files.attach](@dev.1c-bitrix.ru/rest_help/tasks/task/tasks/tasks_task_files_attach.php)
//
// Parameters:
// Parameters:
// URL - String - URL of webhook or a Bitrix24 domain, when token used - url
// TaskID - Number, String - Task ID - task
// FileID - Number, String - File ID - fileid
Expand Down Expand Up @@ -1042,15 +1042,17 @@ EndFunction
// Map Of KeyAndValue - serialized JSON of answer from Bitrix24 API
Function AddTasksChecklistElement(Val URL, Val TaskID, Val Text, Val Completed = False, Token = "") Export

String_ = "String";

Parameters = NormalizeAuth(URL, Token, "task.checklistitem.add");
Fields = New Structure;

MakeBoolean(Completed);

OPI_Tools.AddField("TITLE" , Text , "String", Fields);
OPI_Tools.AddField("IS_COMPLETE", Completed, "String", Fields);
OPI_Tools.AddField("TITLE" , Text , String_, Fields);
OPI_Tools.AddField("IS_COMPLETE", Completed, String_, Fields);

OPI_Tools.AddField("TASKID", TaskID, "String" , Parameters);
OPI_Tools.AddField("TASKID", TaskID, String_ , Parameters);
OPI_Tools.AddField("FIELDS", Fields , "Collection", Parameters);

Response = OPI_Tools.Post(URL, Parameters);
Expand All @@ -1076,13 +1078,15 @@ EndFunction
// Map Of KeyAndValue - serialized JSON of answer from Bitrix24 API
Function UpdateTasksChecklistElement(Val URL, Val TaskID, Val ElementID, Val Text, Val Token = "") Export

String_ = "String";

Parameters = NormalizeAuth(URL, Token, "task.checklistitem.update");
Fields = New Structure;

OPI_Tools.AddField("TITLE", Text, "String", Fields);
OPI_Tools.AddField("TITLE", Text, String_, Fields);

OPI_Tools.AddField("TASKID", TaskID , "String" , Parameters);
OPI_Tools.AddField("ITEMID", ElementID, "String" , Parameters);
OPI_Tools.AddField("TASKID", TaskID , String_ , Parameters);
OPI_Tools.AddField("ITEMID", ElementID, String_ , Parameters);
OPI_Tools.AddField("FIELDS", Fields , "Collection", Parameters);

Response = OPI_Tools.Post(URL, Parameters);
Expand Down Expand Up @@ -1301,13 +1305,15 @@ EndFunction
// Map Of KeyAndValue - serialized JSON of answer from Bitrix24 API
Function UpdateTaskComment(Val URL, Val TaskID, Val CommentID, Val Text, Val Token = "") Export

String_ = "String";

Parameters = NormalizeAuth(URL, Token, "task.commentitem.update");

Comment = New Structure;
OPI_Tools.AddField("POST_MESSAGE", Text, "String", Comment);

OPI_Tools.AddField("TASKID", TaskID , "String" , Parameters);
OPI_Tools.AddField("ITEMID", CommentID, "String" , Parameters);
OPI_Tools.AddField("TASKID", TaskID , String_ , Parameters);
OPI_Tools.AddField("ITEMID", CommentID, String_ , Parameters);
OPI_Tools.AddField("FIELDS", Comment , "Collection", Parameters);

Response = OPI_Tools.Post(URL, Parameters);
Expand Down Expand Up @@ -1473,16 +1479,18 @@ Function AddKanbanStage(Val URL
, Val AsAdmin = False
, Val Token = "") Export

String_ = "String";

Parameters = NormalizeAuth(URL, Token, "task.stages.add");
Fields = New Structure;

MakeBoolean(AsAdmin);

OPI_Tools.AddField("TITLE" , Name , "String", Fields);
OPI_Tools.AddField("COLOR" , Color , "String", Fields);
OPI_Tools.AddField("AFTER_ID" , PrevStageID , "String", Fields);
OPI_Tools.AddField("ENTITY_ID", EntityID , "String", Fields);
OPI_Tools.AddField("isAdmin" , AsAdmin, "String", Fields);
OPI_Tools.AddField("TITLE" , Name , String_, Fields);
OPI_Tools.AddField("COLOR" , Color , String_, Fields);
OPI_Tools.AddField("AFTER_ID" , PrevStageID , String_, Fields);
OPI_Tools.AddField("ENTITY_ID", EntityID , String_, Fields);
OPI_Tools.AddField("isAdmin" , AsAdmin, String_, Fields);

Parameters.Insert("fields", Fields);

Expand Down Expand Up @@ -1517,15 +1525,17 @@ Function UpdateKanbansStage(Val URL
, Val AsAdmin = False
, Val Token = "") Export

String_ = "String";

Parameters = NormalizeAuth(URL, Token, "task.stages.update");
Fields = New Structure;

OPI_Tools.AddField("TITLE" , Name , "String", Fields);
OPI_Tools.AddField("COLOR" , Color , "String", Fields);
OPI_Tools.AddField("AFTER_ID" , PrevStageID , "String", Fields);
OPI_Tools.AddField("TITLE" , Name , String_, Fields);
OPI_Tools.AddField("COLOR" , Color , String_, Fields);
OPI_Tools.AddField("AFTER_ID" , PrevStageID , String_, Fields);
OPI_Tools.AddField("isAdmin" , AsAdmin, "Boolean", Fields);

OPI_Tools.AddField("id" , StageID, "String" , Parameters);
OPI_Tools.AddField("id" , StageID, String_ , Parameters);
OPI_Tools.AddField("fields", Fields , "Collection", Parameters);

Response = OPI_Tools.Post(URL, Parameters);
Expand Down Expand Up @@ -1616,20 +1626,21 @@ Function MoveTaskToKanbanStage(Val URL
, Val After = 0
, Val Token = "") Export

String_ = "String";

Parameters = NormalizeAuth(URL, Token, "task.stages.movetask");

OPI_Tools.AddField("id" , TaskID, "String", Parameters);
OPI_Tools.AddField("stageId", StageID, "String", Parameters);
OPI_Tools.AddField("id" , TaskID, String_, Parameters);
OPI_Tools.AddField("stageId", StageID, String_, Parameters);

If ValueIsFilled(Prev) Then

OPI_Tools.AddField("before", Prev, "String", Parameters);
OPI_Tools.AddField("before", Prev, String_, Parameters);

Else

OPI_TypeConversion.GetLine(After);
OPI_Tools.AddField("after", After, "String", Parameters);
OPI_Tools.AddField("after", After, String_, Parameters);

EndIf;

Expand Down Expand Up @@ -1668,15 +1679,17 @@ Function AddTaskTimeAccounting(Val URL
, Val SetupDate = ""
, Val Token = "") Export

String_ = "String";

Parameters = NormalizeAuth(URL, Token, "task.elapseditem.add");
Fields = New Structure;

OPI_Tools.AddField("SECONDS" , Time , "String" , Fields);
OPI_Tools.AddField("COMMENT_TEXT", Text , "String" , Fields);
OPI_Tools.AddField("USER_ID" , UserID, "String" , Fields);
OPI_Tools.AddField("SECONDS" , Time , String_ , Fields);
OPI_Tools.AddField("COMMENT_TEXT", Text , String_ , Fields);
OPI_Tools.AddField("USER_ID" , UserID, String_ , Fields);
OPI_Tools.AddField("CREATED_DATE", SetupDate , "DateISO", Fields);

OPI_Tools.AddField("TASKID" , TaskID, "String" , Parameters);
OPI_Tools.AddField("TASKID" , TaskID, String_ , Parameters);
OPI_Tools.AddField("ARFIELDS", Fields , "Collection", Parameters);

Response = OPI_Tools.Post(URL, Parameters);
Expand Down Expand Up @@ -1788,16 +1801,18 @@ Function UpdateTaskTimeAccounting(Val URL
, Val Text = ""
, Val SetupDate = ""
, Val Token = "") Export


String_ = "String";

Parameters = NormalizeAuth(URL, Token, "task.elapseditem.update");
Fields = New Structure;

OPI_Tools.AddField("SECONDS" , Time , "String" , Fields);
OPI_Tools.AddField("COMMENT_TEXT", Text , "String" , Fields);
OPI_Tools.AddField("SECONDS" , Time , String_ , Fields);
OPI_Tools.AddField("COMMENT_TEXT", Text , String_ , Fields);
OPI_Tools.AddField("CREATED_DATE", SetupDate , "DateISO", Fields);

OPI_Tools.AddField("TASKID" , TaskID, "String" , Parameters);
OPI_Tools.AddField("ITEMID" , RecordID, "String" , Parameters);
OPI_Tools.AddField("TASKID" , TaskID, String_ , Parameters);
OPI_Tools.AddField("ITEMID" , RecordID, String_ , Parameters);
OPI_Tools.AddField("ARFIELDS", Fields , "Collection", Parameters);

Response = OPI_Tools.Post(URL, Parameters);
Expand Down Expand Up @@ -2301,7 +2316,6 @@ EndFunction
// Map Of KeyAndValue - serialized JSON of answer from Bitrix24 API
Function UploadFileToFolder(Val URL, Val Name, Val File, Val FolderID, Val Token = "") Export


OPI_TypeConversion.GetLine(Name);
OPI_TypeConversion.GetBinaryData(File);

Expand Down Expand Up @@ -2329,8 +2343,7 @@ Function UploadFileToFolder(Val URL, Val Name, Val File, Val FolderID, Val Token

EndIf;

EndIf;

EndIf;

Return Response;

Expand Down Expand Up @@ -2824,14 +2837,16 @@ Function GetChatMessagesList(Val URL
, Val FirstID = ""
, Val Token = "") Export

String_ = "String";

OPI_TypeConversion.GetLine(LastID);
OPI_TypeConversion.GetLine(FirstID);

Parameters = NormalizeAuth(URL, Token, "im.dialog.messages.get");

OPI_Tools.AddField("DIALOG_ID", ChatID , "String", Parameters);
OPI_Tools.AddField("LAST_ID" , LastID, "String", Parameters);
OPI_Tools.AddField("FIRST_ID" , FirstID , "String", Parameters);
OPI_Tools.AddField("DIALOG_ID", ChatID , String_, Parameters);
OPI_Tools.AddField("LAST_ID" , LastID, String_, Parameters);
OPI_Tools.AddField("FIRST_ID" , FirstID , String_, Parameters);

Response = OPI_Tools.Post(URL, Parameters);

Expand Down Expand Up @@ -3117,11 +3132,13 @@ EndFunction
// Map Of KeyAndValue - serialized JSON of answer from Bitrix24 API
Function SendFile(Val URL, Val ChatID, Val FileID, Val Description = "", Val Token = "") Export

String_ = "String";

Parameters = NormalizeAuth(URL, Token, "im.disk.file.commit");

OPI_Tools.AddField("CHAT_ID" , ChatID , "String", Parameters);
OPI_Tools.AddField("UPLOAD_ID", FileID , "String", Parameters);
OPI_Tools.AddField("MESSAGE" , Description, "String", Parameters);
OPI_Tools.AddField("CHAT_ID" , ChatID , String_, Parameters);
OPI_Tools.AddField("UPLOAD_ID", FileID , String_, Parameters);
OPI_Tools.AddField("MESSAGE" , Description, String_, Parameters);

Response = OPI_Tools.Post(URL, Parameters);

Expand Down
2 changes: 1 addition & 1 deletion src/en/OInt/packagedef
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Описание.Имя("oint")
Описание.Имя("oint")
.Версия("1.11.0")
.Автор("bayselonarrend")
.АдресАвтора("bayselonarrend@gmail.com")
Expand Down
9 changes: 4 additions & 5 deletions src/en/OInt/tests/Modules/internal/OPI_Tests.os
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8013,7 +8013,7 @@ Procedure Bitrix24_UpdateTaskComment(FunctionParameters)

OPI_TestDataRetrieval.WriteLog(Result, "UpdateTaskComment (wh)", "Bitrix24");

Check_BitrixTrue(Result); // SKIP
Check_BitrixTrue(Result); // SKIP

URL = FunctionParameters["Bitrix24_Domain"];
Token = FunctionParameters["Bitrix24_Token"];
Expand Down Expand Up @@ -8184,7 +8184,7 @@ Procedure Bitrix24_MoveTaskToKanbanStage(FunctionParameters)

Check_BitrixTrue(Result);

OPI_Bitrix24.MoveTaskToKanbanStage(URL, TaskID, 2, , , Token)
OPI_Bitrix24.MoveTaskToKanbanStage(URL, TaskID, 2, , , Token);

EndProcedure

Expand Down Expand Up @@ -8944,12 +8944,11 @@ Procedure Bitrix24_GetChatMessagesList(FunctionParameters)
OPI_TestDataRetrieval.WriteParameter("Bitrix24_ChatMessageID", MessageID); // SKIP
FunctionParameters.Insert("Bitrix24_ChatMessageID", MessageID); // SKIP


URL = FunctionParameters["Bitrix24_Domain"];
Token = FunctionParameters["Bitrix24_Token"];
UserID = 10;

Result = OPI_Bitrix24.GetChatMessagesList(URL, UserID, , 0,Token);
Result = OPI_Bitrix24.GetChatMessagesList(URL, UserID, , 0, Token);

// END

Expand Down Expand Up @@ -8980,7 +8979,7 @@ Procedure Bitrix24_MarkMessageAsReaded(FunctionParameters)
UserID = 10;
MessageID = FunctionParameters["Bitrix24_UserMessageID"];

Result = OPI_Bitrix24.MarkMessageAsReaded(URL, UserID, MessageID,Token);
Result = OPI_Bitrix24.MarkMessageAsReaded(URL, UserID, MessageID, Token);

// END

Expand Down
3 changes: 2 additions & 1 deletion src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os
View file
Original file line number Diff line number Diff line change
Expand Up @@ -826,8 +826,9 @@ Function SplitFileKey(Val FileData, Val ContentType)
DotReplacement = "___";
FileName = StrReplace(FileData, DotReplacement, ".");
NameParts = StrSplit(FileName, "|", False);
NameParts = 2;

If NameParts.Count() = 2 Then
If NameParts.Count() = NameParts Then
FieldName = NameParts[0];
FileName = NameParts[1];
Else
Expand Down
3 changes: 1 addition & 2 deletions src/en/OPI/DT-INF/PROJECT.PMF
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Manifest-Version: 1.0
Runtime-Version: 8.3.15
Base-Project: OpenIntegrations_Eng
Manifest-Version: 1.0
Base-Project: OpenIntegrations_ENG
Loading

0 comments on commit eef4f58

Please sign in to comment.