kickflow 0.2.1 → 0.3.0

data/lib/kickflow/models/route_step_target.rb

@@ -26,13 +26,17 @@ module Kickflow
     # 承認者の指定に使う役職の配列
     attr_accessor :grades
 
+    # 承認者タイプ「チームを動的に指定」で指定する変数名が入ります。
+    attr_accessor :variable
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'team' => :'team',
         :'descendants' => :'descendants',
         :'grade_symbol' => :'gradeSymbol',
-        :'grades' => :'grades'
+        :'grades' => :'grades',
+        :'variable' => :'variable'
       }
     end
 
@@ -47,7 +51,8 @@ module Kickflow
         :'team' => :'Team',
         :'descendants' => :'Boolean',
         :'grade_symbol' => :'String',
-        :'grades' => :'Array<Grade>'
+        :'grades' => :'Array<Grade>',
+        :'variable' => :'String'
       }
     end
 
@@ -89,6 +94,10 @@ module Kickflow
           self.grades = value
         end
       end
+
+      if attributes.key?(:'variable')
+        self.variable = attributes[:'variable']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -114,7 +123,8 @@ module Kickflow
           team == o.team &&
           descendants == o.descendants &&
           grade_symbol == o.grade_symbol &&
-          grades == o.grades
+          grades == o.grades &&
+          variable == o.variable
     end
 
     # @see the `==` method
@@ -126,7 +136,7 @@ module Kickflow
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [team, descendants, grade_symbol, grades].hash
+      [team, descendants, grade_symbol, grades, variable].hash
     end
 
     # Builds the object from hash

data/lib/kickflow/models/ticket_assignee.rb

@@ -31,6 +31,9 @@ module Kickflow
     # 承認日時。古いデータではnullを返します。
     attr_accessor :completed_at
 
+    # 承認を保留中の場合true
+    attr_accessor :pending
+
     attr_accessor :user
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -41,6 +44,7 @@ module Kickflow
         :'current' => :'current',
         :'completed' => :'completed',
         :'completed_at' => :'completedAt',
+        :'pending' => :'pending',
         :'user' => :'user'
       }
     end
@@ -58,6 +62,7 @@ module Kickflow
         :'current' => :'Boolean',
         :'completed' => :'Boolean',
         :'completed_at' => :'Time',
+        :'pending' => :'Boolean',
         :'user' => :'User'
       }
     end
@@ -114,6 +119,12 @@ module Kickflow
         self.completed_at = nil
       end
 
+      if attributes.key?(:'pending')
+        self.pending = attributes[:'pending']
+      else
+        self.pending = nil
+      end
+
       if attributes.key?(:'user')
         self.user = attributes[:'user']
       else
@@ -142,6 +153,10 @@ module Kickflow
         invalid_properties.push('invalid value for "completed", completed cannot be nil.')
       end
 
+      if @pending.nil?
+        invalid_properties.push('invalid value for "pending", pending cannot be nil.')
+      end
+
       if @user.nil?
         invalid_properties.push('invalid value for "user", user cannot be nil.')
       end
@@ -157,6 +172,7 @@ module Kickflow
       return false if @step_order.nil?
       return false if @current.nil?
       return false if @completed.nil?
+      return false if @pending.nil?
       return false if @user.nil?
       true
     end
@@ -171,6 +187,7 @@ module Kickflow
           current == o.current &&
           completed == o.completed &&
           completed_at == o.completed_at &&
+          pending == o.pending &&
           user == o.user
     end
 
@@ -183,7 +200,7 @@ module Kickflow
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, step_order, current, completed, completed_at, user].hash
+      [id, step_order, current, completed, completed_at, pending, user].hash
     end
 
     # Builds the object from hash

data/lib/kickflow/models/ticket_viewer.rb

@@ -25,13 +25,17 @@ module Kickflow
 
     attr_accessor :grade
 
+    # 下位のチームを含めるかどうか
+    attr_accessor :descendants
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'id' => :'id',
         :'user' => :'user',
         :'team' => :'team',
-        :'grade' => :'grade'
+        :'grade' => :'grade',
+        :'descendants' => :'descendants'
       }
     end
 
@@ -46,7 +50,8 @@ module Kickflow
         :'id' => :'String',
         :'user' => :'User',
         :'team' => :'Team',
-        :'grade' => :'Grade'
+        :'grade' => :'Grade',
+        :'descendants' => :'Boolean'
       }
     end
 
@@ -55,7 +60,7 @@ module Kickflow
       Set.new([
         :'user',
         :'team',
-        :'grade'
+        :'grade',
       ])
     end
 
@@ -97,6 +102,12 @@ module Kickflow
       else
         self.grade = nil
       end
+
+      if attributes.key?(:'descendants')
+        self.descendants = attributes[:'descendants']
+      else
+        self.descendants = nil
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -108,6 +119,10 @@ module Kickflow
         invalid_properties.push('invalid value for "id", id cannot be nil.')
       end
 
+      if @descendants.nil?
+        invalid_properties.push('invalid value for "descendants", descendants cannot be nil.')
+      end
+
       invalid_properties
     end
 
@@ -116,6 +131,7 @@ module Kickflow
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @id.nil?
+      return false if @descendants.nil?
       true
     end
 
@@ -127,7 +143,8 @@ module Kickflow
           id == o.id &&
           user == o.user &&
           team == o.team &&
-          grade == o.grade
+          grade == o.grade &&
+          descendants == o.descendants
     end
 
     # @see the `==` method
@@ -139,7 +156,7 @@ module Kickflow
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, user, team, grade].hash
+      [id, user, team, grade, descendants].hash
     end
 
     # Builds the object from hash

data/lib/kickflow/models/workflow.rb

@@ -49,18 +49,6 @@ module Kickflow
     # タイトルの説明
     attr_accessor :title_description
 
-    # 明細を持つ場合true。このフィールドは廃止予定です。代わりにsectionListのsectionTypeを参照してください。
-    attr_accessor :slip
-
-    # 明細タイトル。このフィールドは廃止予定です。代わりにsectionListのtitleを参照してください。
-    attr_accessor :slip_title
-
-    # 明細の説明。このフィールドは廃止予定です。代わりにsectionListのdescriptionを参照してください。
-    attr_accessor :slip_description
-
-    # 明細の位置。このフィールドは廃止予定です。代わりにsectionListを参照してください。
-    attr_accessor :slip_position
-
     # チケット番号のフォーマット
     attr_accessor :ticket_number_format
 
@@ -127,10 +115,6 @@ module Kickflow
         :'visible_to_manager' => :'visibleToManager',
         :'visible_to_team_members' => :'visibleToTeamMembers',
         :'title_description' => :'titleDescription',
-        :'slip' => :'slip',
-        :'slip_title' => :'slipTitle',
-        :'slip_description' => :'slipDescription',
-        :'slip_position' => :'slipPosition',
         :'ticket_number_format' => :'ticketNumberFormat',
         :'overwritable' => :'overwritable',
         :'created_at' => :'createdAt',
@@ -164,10 +148,6 @@ module Kickflow
         :'visible_to_manager' => :'String',
         :'visible_to_team_members' => :'Boolean',
         :'title_description' => :'String',
-        :'slip' => :'Boolean',
-        :'slip_title' => :'String',
-        :'slip_description' => :'String',
-        :'slip_position' => :'String',
         :'ticket_number_format' => :'String',
         :'overwritable' => :'Boolean',
         :'created_at' => :'String',
@@ -186,8 +166,6 @@ module Kickflow
     def self.openapi_nullable
       Set.new([
         :'title_description',
-        :'slip_title',
-        :'slip_description',
         :'ticket_number_format',
         :'title_formula',
         :'author',
@@ -276,30 +254,6 @@ module Kickflow
         self.title_description = nil
       end
 
-      if attributes.key?(:'slip')
-        self.slip = attributes[:'slip']
-      else
-        self.slip = false
-      end
-
-      if attributes.key?(:'slip_title')
-        self.slip_title = attributes[:'slip_title']
-      else
-        self.slip_title = nil
-      end
-
-      if attributes.key?(:'slip_description')
-        self.slip_description = attributes[:'slip_description']
-      else
-        self.slip_description = nil
-      end
-
-      if attributes.key?(:'slip_position')
-        self.slip_position = attributes[:'slip_position']
-      else
-        self.slip_position = nil
-      end
-
       if attributes.key?(:'ticket_number_format')
         self.ticket_number_format = attributes[:'ticket_number_format']
       else
@@ -419,14 +373,6 @@ module Kickflow
         invalid_properties.push('invalid value for "visible_to_team_members", visible_to_team_members cannot be nil.')
       end
 
-      if @slip.nil?
-        invalid_properties.push('invalid value for "slip", slip cannot be nil.')
-      end
-
-      if @slip_position.nil?
-        invalid_properties.push('invalid value for "slip_position", slip_position cannot be nil.')
-      end
-
       if @overwritable.nil?
         invalid_properties.push('invalid value for "overwritable", overwritable cannot be nil.')
       end
@@ -473,10 +419,6 @@ module Kickflow
       visible_to_manager_validator = EnumAttributeValidator.new('String', ["none", "direct", "all"])
       return false unless visible_to_manager_validator.valid?(@visible_to_manager)
       return false if @visible_to_team_members.nil?
-      return false if @slip.nil?
-      return false if @slip_position.nil?
-      slip_position_validator = EnumAttributeValidator.new('String', ["top", "bottom"])
-      return false unless slip_position_validator.valid?(@slip_position)
       return false if @overwritable.nil?
       return false if @created_at.nil?
       return false if @updated_at.nil?
@@ -523,16 +465,6 @@ module Kickflow
       @visible_to_manager = visible_to_manager
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] slip_position Object to be assigned
-    def slip_position=(slip_position)
-      validator = EnumAttributeValidator.new('String', ["top", "bottom"])
-      unless validator.valid?(slip_position)
-        fail ArgumentError, "invalid value for \"slip_position\", must be one of #{validator.allowable_values}."
-      end
-      @slip_position = slip_position
-    end
-
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] title_input_mode Object to be assigned
     def title_input_mode=(title_input_mode)
@@ -559,10 +491,6 @@ module Kickflow
           visible_to_manager == o.visible_to_manager &&
           visible_to_team_members == o.visible_to_team_members &&
           title_description == o.title_description &&
-          slip == o.slip &&
-          slip_title == o.slip_title &&
-          slip_description == o.slip_description &&
-          slip_position == o.slip_position &&
           ticket_number_format == o.ticket_number_format &&
           overwritable == o.overwritable &&
           created_at == o.created_at &&
@@ -585,7 +513,7 @@ module Kickflow
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, code, version_id, version_number, name, description, status, public_ticket, visible_to_manager, visible_to_team_members, title_description, slip, slip_title, slip_description, slip_position, ticket_number_format, overwritable, created_at, updated_at, title_input_mode, title_formula, allow_editing_of_viewers, author, version_author, folder, categories].hash
+      [id, code, version_id, version_number, name, description, status, public_ticket, visible_to_manager, visible_to_team_members, title_description, ticket_number_format, overwritable, created_at, updated_at, title_input_mode, title_formula, allow_editing_of_viewers, author, version_author, folder, categories].hash
     end
 
     # Builds the object from hash

data/lib/kickflow/models/workflow_detail.rb

@@ -49,18 +49,6 @@ module Kickflow
     # タイトルの説明
     attr_accessor :title_description
 
-    # 明細を持つ場合true。このフィールドは廃止予定です。代わりにsectionListのsectionTypeを参照してください。
-    attr_accessor :slip
-
-    # 明細タイトル。このフィールドは廃止予定です。代わりにsectionListのtitleを参照してください。
-    attr_accessor :slip_title
-
-    # 明細の説明。このフィールドは廃止予定です。代わりにsectionListのdescriptionを参照してください。
-    attr_accessor :slip_description
-
-    # 明細の位置。このフィールドは廃止予定です。代わりにsectionListを参照してください。
-    attr_accessor :slip_position
-
     # チケット番号のフォーマット
     attr_accessor :ticket_number_format
 
@@ -94,12 +82,6 @@ module Kickflow
     # セクション・明細を表すオブジェクトを画面に表示される順に格納した配列。
     attr_accessor :section_list
 
-    # セクションの配列。このフィールドは廃止予定です。代わりにsectionListを参照してください。
-    attr_accessor :sections
-
-    # 明細フィールド
-    attr_accessor :slip_fields
-
     # ワークフロー単位のチケット閲覧者
     attr_accessor :ticket_viewers
 
@@ -144,10 +126,6 @@ module Kickflow
         :'visible_to_manager' => :'visibleToManager',
         :'visible_to_team_members' => :'visibleToTeamMembers',
         :'title_description' => :'titleDescription',
-        :'slip' => :'slip',
-        :'slip_title' => :'slipTitle',
-        :'slip_description' => :'slipDescription',
-        :'slip_position' => :'slipPosition',
         :'ticket_number_format' => :'ticketNumberFormat',
         :'overwritable' => :'overwritable',
         :'created_at' => :'createdAt',
@@ -160,8 +138,6 @@ module Kickflow
         :'folder' => :'folder',
         :'categories' => :'categories',
         :'section_list' => :'sectionList',
-        :'sections' => :'sections',
-        :'slip_fields' => :'slipFields',
         :'ticket_viewers' => :'ticketViewers',
         :'cloud_sign_setting' => :'cloudSignSetting',
         :'route_conditions' => :'routeConditions'
@@ -187,10 +163,6 @@ module Kickflow
         :'visible_to_manager' => :'String',
         :'visible_to_team_members' => :'Boolean',
         :'title_description' => :'String',
-        :'slip' => :'Boolean',
-        :'slip_title' => :'String',
-        :'slip_description' => :'String',
-        :'slip_position' => :'String',
         :'ticket_number_format' => :'String',
         :'overwritable' => :'Boolean',
         :'created_at' => :'String',
@@ -203,8 +175,6 @@ module Kickflow
         :'folder' => :'Folder',
         :'categories' => :'Array<Category>',
         :'section_list' => :'Array<SectionListItem>',
-        :'sections' => :'Array<Section>',
-        :'slip_fields' => :'Array<SlipFieldDetail>',
         :'ticket_viewers' => :'Array<WorkflowTicketViewer>',
         :'cloud_sign_setting' => :'WorkflowInTicketAllOfCloudSignSetting',
         :'route_conditions' => :'Array<WorkflowRouteCondition>'
@@ -215,8 +185,6 @@ module Kickflow
     def self.openapi_nullable
       Set.new([
         :'title_description',
-        :'slip_title',
-        :'slip_description',
         :'ticket_number_format',
         :'title_formula',
         :'cloud_sign_setting',
@@ -311,30 +279,6 @@ module Kickflow
         self.title_description = nil
       end
 
-      if attributes.key?(:'slip')
-        self.slip = attributes[:'slip']
-      else
-        self.slip = false
-      end
-
-      if attributes.key?(:'slip_title')
-        self.slip_title = attributes[:'slip_title']
-      else
-        self.slip_title = nil
-      end
-
-      if attributes.key?(:'slip_description')
-        self.slip_description = attributes[:'slip_description']
-      else
-        self.slip_description = nil
-      end
-
-      if attributes.key?(:'slip_position')
-        self.slip_position = attributes[:'slip_position']
-      else
-        self.slip_position = nil
-      end
-
       if attributes.key?(:'ticket_number_format')
         self.ticket_number_format = attributes[:'ticket_number_format']
       else
@@ -409,22 +353,6 @@ module Kickflow
         end
       end
 
-      if attributes.key?(:'sections')
-        if (value = attributes[:'sections']).is_a?(Array)
-          self.sections = value
-        end
-      else
-        self.sections = nil
-      end
-
-      if attributes.key?(:'slip_fields')
-        if (value = attributes[:'slip_fields']).is_a?(Array)
-          self.slip_fields = value
-        end
-      else
-        self.slip_fields = nil
-      end
-
       if attributes.key?(:'ticket_viewers')
         if (value = attributes[:'ticket_viewers']).is_a?(Array)
           self.ticket_viewers = value
@@ -498,14 +426,6 @@ module Kickflow
         invalid_properties.push('invalid value for "visible_to_team_members", visible_to_team_members cannot be nil.')
       end
 
-      if @slip.nil?
-        invalid_properties.push('invalid value for "slip", slip cannot be nil.')
-      end
-
-      if @slip_position.nil?
-        invalid_properties.push('invalid value for "slip_position", slip_position cannot be nil.')
-      end
-
       if @overwritable.nil?
         invalid_properties.push('invalid value for "overwritable", overwritable cannot be nil.')
       end
@@ -538,14 +458,6 @@ module Kickflow
         invalid_properties.push('invalid value for "categories", categories cannot be nil.')
       end
 
-      if @sections.nil?
-        invalid_properties.push('invalid value for "sections", sections cannot be nil.')
-      end
-
-      if @slip_fields.nil?
-        invalid_properties.push('invalid value for "slip_fields", slip_fields cannot be nil.')
-      end
-
       if @ticket_viewers.nil?
         invalid_properties.push('invalid value for "ticket_viewers", ticket_viewers cannot be nil.')
       end
@@ -576,10 +488,6 @@ module Kickflow
       visible_to_manager_validator = EnumAttributeValidator.new('String', ["none", "direct", "all"])
       return false unless visible_to_manager_validator.valid?(@visible_to_manager)
       return false if @visible_to_team_members.nil?
-      return false if @slip.nil?
-      return false if @slip_position.nil?
-      slip_position_validator = EnumAttributeValidator.new('String', ["top", "bottom"])
-      return false unless slip_position_validator.valid?(@slip_position)
       return false if @overwritable.nil?
       return false if @created_at.nil?
       return false if @updated_at.nil?
@@ -590,8 +498,6 @@ module Kickflow
       return false if @version_author.nil?
       return false if @folder.nil?
       return false if @categories.nil?
-      return false if @sections.nil?
-      return false if @slip_fields.nil?
       return false if @ticket_viewers.nil?
       return false if @route_conditions.nil?
       true
@@ -632,16 +538,6 @@ module Kickflow
       @visible_to_manager = visible_to_manager
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] slip_position Object to be assigned
-    def slip_position=(slip_position)
-      validator = EnumAttributeValidator.new('String', ["top", "bottom"])
-      unless validator.valid?(slip_position)
-        fail ArgumentError, "invalid value for \"slip_position\", must be one of #{validator.allowable_values}."
-      end
-      @slip_position = slip_position
-    end
-
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] title_input_mode Object to be assigned
     def title_input_mode=(title_input_mode)
@@ -668,10 +564,6 @@ module Kickflow
           visible_to_manager == o.visible_to_manager &&
           visible_to_team_members == o.visible_to_team_members &&
           title_description == o.title_description &&
-          slip == o.slip &&
-          slip_title == o.slip_title &&
-          slip_description == o.slip_description &&
-          slip_position == o.slip_position &&
           ticket_number_format == o.ticket_number_format &&
           overwritable == o.overwritable &&
           created_at == o.created_at &&
@@ -684,8 +576,6 @@ module Kickflow
           folder == o.folder &&
           categories == o.categories &&
           section_list == o.section_list &&
-          sections == o.sections &&
-          slip_fields == o.slip_fields &&
           ticket_viewers == o.ticket_viewers &&
           cloud_sign_setting == o.cloud_sign_setting &&
           route_conditions == o.route_conditions
@@ -700,7 +590,7 @@ module Kickflow
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, code, version_id, version_number, name, description, status, public_ticket, visible_to_manager, visible_to_team_members, title_description, slip, slip_title, slip_description, slip_position, ticket_number_format, overwritable, created_at, updated_at, title_input_mode, title_formula, allow_editing_of_viewers, author, version_author, folder, categories, section_list, sections, slip_fields, ticket_viewers, cloud_sign_setting, route_conditions].hash
+      [id, code, version_id, version_number, name, description, status, public_ticket, visible_to_manager, visible_to_team_members, title_description, ticket_number_format, overwritable, created_at, updated_at, title_input_mode, title_formula, allow_editing_of_viewers, author, version_author, folder, categories, section_list, ticket_viewers, cloud_sign_setting, route_conditions].hash
     end
 
     # Builds the object from hash