Merge pull request #448 from ggildong/master

fix: typo in task.proto
cloudforet-io · Nov 19, 2024 · d2946da · d2946da
2 parents d414e1b + cc3132a
commit d2946da
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 37 deletions.
diff --git a/proto/spaceone/api/opsflow/comment.proto b/proto/spaceone/api/opsflow/comment.proto
@@ -81,15 +81,15 @@ message CommentSearchQuery {
     string comment_id = 3;
     // +optional
     CommentInfo.CommentType comment_type = 4;
+    // +optional
+    string user_id = 5;
+    // +optional
+    string user_group_id = 6;
 
     // +optional
     string workspace_id = 11;
     // +optional
     string project_id = 12;
-    // +optional
-    string user_group_id = 13;
-    // +optional
-    string user_id = 14;
 }
 
 message CommentInfo {

diff --git a/proto/spaceone/api/opsflow/event.proto b/proto/spaceone/api/opsflow/event.proto
@@ -4,11 +4,9 @@ package spaceone.api.opsflow.v1;
 
 option go_package = "github.com/cloudforet-io/api/dist/go/spaceone/api/opsflow/v1";
 
-import "google/protobuf/empty.proto";
 import "google/protobuf/struct.proto";
 import "google/api/annotations.proto";
 import "spaceone/api/core/v2/query.proto";
-import "spaceone/api/opsflow/comment.proto";
 
 
 service Event {
@@ -32,17 +30,17 @@ message EventSearchQuery {
     // +optional
     string task_id = 2;
     // +optional
-    string event_id = 3;
+    EventInfo.EventType event_type = 3;
     // +optional
-    string workspace_id = 4;
+    string user_type = 4;
     // +optional
-    string project_id = 5;
+    string event_id = 5;
     // +optional
-    string user_type = 6;
+    string user_id = 6;
     // +optional
-    string user_id = 7;
+    string workspace_id = 7;
     // +optional
-    EventInfo.EventType event_type = 8;
+    string project_id = 8;
 }
 
 message EventInfo {

diff --git a/proto/spaceone/api/opsflow/task.proto b/proto/spaceone/api/opsflow/task.proto
@@ -26,7 +26,7 @@ service Task {
             body: "*"
         };
     }
-    rpc change_status (TaskStatusRequest) returns (TaskInfo) {
+    rpc change_status (TaskChangeStatusRequest) returns (TaskInfo) {
         option (google.api.http) = {
             post: "/opsflow/v1/task/change_status"
             body: "*"
@@ -67,7 +67,7 @@ enum TaskPriority {
 
 message TaskCreateRequest {
     string name = 1;
-    string status = 2;
+    string status_id = 2;
     // +optional
     TaskPriority priority = 3;
     // +optional
@@ -104,13 +104,11 @@ message TaskUpdateRequest {
     string project_id = 21;
 }
 
-message TaskStatusRequest {
+message TaskChangeStatusRequest {
     string task_id = 1;
-    string status = 2;
+    string status_id = 2;
     // +optional
     string assignee = 3;
-    // +optional
-    string comment = 4;
 }
 
 message TaskRequest {
@@ -125,17 +123,17 @@ message TaskSearchQuery {
     // +optional
     string name = 3;
     // +optional
-    string status = 4;
+    string status_id = 4;
     // +optional
-    spaceone.api.opsflow.v1.StatusType status_type = 5;
+    string status_type = 5;
     // +optional
     TaskPriority priority = 6;
     // +optional
     string workspace_id = 11;
     // +optional
     string project_id = 12;
     // +optional
-    string task_category_id = 13;
+    string category_id = 13;
     // +optional
     string task_type_id = 14;
 }
@@ -144,16 +142,17 @@ message TaskInfo {
     string task_id = 1;
     string name = 2;
     string status = 3;
-    spaceone.api.opsflow.v1.StatusType status_type = 4;
+    string status_type = 4;
     TaskPriority priority = 5;
     string description = 6;
     google.protobuf.Struct data = 7;
     repeated spaceone.api.file_manager.v1.FileInfo files = 8;
+    string assignee = 9;
 
     string domain_id = 21;
     string workspace_id = 22;
     string project_id = 23;
-    string task_category_id = 24;
+    string category_id = 24;
     string task_type_id = 25;
 
     string created_at = 31;

diff --git a/proto/spaceone/api/opsflow/task_category.proto b/proto/spaceone/api/opsflow/task_category.proto
@@ -49,17 +49,17 @@ service TaskCategory {
     }
 }
 
-enum StatusType {
-    STATUS_NONE = 0;
-    TODO = 1;
-    IN_PROGRESS = 2;
-    COMPLETED = 3;
+message StatusOptions {
+    repeated StatusOption TODO = 1;
+    repeated StatusOption IN_PROGRESS = 2;
+    repeated StatusOption COMPLETED = 3;
 }
 
 message StatusOption {
-    string name = 1;
-    string color = 2;
-    StatusType status_type = 3;
+    string status_id = 1;
+    string name = 2;
+    string color = 3;
+    bool is_default = 4;
 }
 
 message TaskField {
@@ -83,7 +83,7 @@ message TaskCategoryCreateRequest {
     string name = 1;
     // +optional
     string description = 2;
-    repeated StatusOption status_option = 3;
+    StatusOptions status_options = 3;
     // +optional
     repeated TaskField fields = 4;
     // +optional
@@ -98,7 +98,7 @@ message TaskCategoryUpdateRequest {
     // +optional
     string description = 3;
     // +optional
-    repeated StatusOption status_option = 4;
+    StatusOptions status_options = 4;
     // +optional
     repeated TaskField fields = 5;
     // +optional
@@ -124,7 +124,7 @@ message TaskCategoryInfo {
     string category_id = 1;
     string name = 2;
     string description = 3;
-    repeated StatusOption status_option = 4;
+    StatusOptions status_options = 4;
     repeated TaskField fields = 5;
     google.protobuf.Struct tags = 11;
 

diff --git a/proto/spaceone/api/opsflow/task_type.proto b/proto/spaceone/api/opsflow/task_type.proto
@@ -55,7 +55,7 @@ message TaskTypeCreateRequest {
     // +optional
     string description = 2;
     // +optional
-    repeated spaceone.api.opsflow.v1.TaskField fields = 3;
+    repeated TaskField fields = 3;
     // +optional
     google.protobuf.Struct tags = 11;
     string category_id = 21;
@@ -68,7 +68,7 @@ message TaskTypeUpdateRequest {
     // +optional
     string description = 3;
     // +optional
-    repeated spaceone.api.opsflow.v1.TaskField fields = 4;
+    repeated TaskField fields = 4;
     // +optional
     google.protobuf.Struct tags = 11;
     // +optional
@@ -92,7 +92,7 @@ message TaskTypeInfo {
     string task_type_id = 1;
     string name = 2;
     string description = 3;
-    repeated spaceone.api.opsflow.v1.TaskField fields = 4;
+    repeated TaskField fields = 4;
     google.protobuf.Struct tags = 11;
 
     string domain_id = 21;