@@ -143,7 +143,7 @@ def most_recent
143143 validates :work_item_type , presence : true
144144 validates :confidential , inclusion : { in : [ true , false ] , message : 'must be a boolean' }
145145
146- validate :allowed_work_item_type_change , on : :update , if : :correct_work_item_type_id_changed ?
146+ validate :allowed_work_item_type_change , on : :update , if : :work_item_type_id_changed ?
147147 validate :due_date_after_start_date , if : :validate_due_date?
148148 validate :parent_link_confidentiality
149149
@@ -207,7 +207,7 @@ def most_recent
207207
208208 scope :with_alert_management_alerts , -> { joins ( :alert_management_alert ) }
209209 scope :with_api_entity_associations , -> {
210- preload ( :: Gitlab :: Issues :: TypeAssociationGetter . call ,
210+ preload ( :work_item_type ,
211211 :timelogs , :closed_by , :assignees , :author , :issuable_severity ,
212212 :labels , namespace : [ { parent : :route } , :route ] , milestone : { project : [ :route , { namespace : :route } ] } ,
213213 project : [ :project_namespace , :project_feature , :route , { group : :route } , { namespace : :route } ] ,
@@ -218,16 +218,16 @@ def most_recent
218218 types = Array ( types )
219219
220220 # Using != 1 since we also want the guard clause to handle empty arrays
221- return joins ( :correct_work_item_type ) . where ( work_item_types : { base_type : types } ) if types . size != 1
221+ return joins ( :work_item_type ) . where ( work_item_types : { base_type : types } ) if types . size != 1
222222
223223 # This optimization helps the planer use the correct indexes when filtering by a single type
224224 where (
225- '"issues"."correct_work_item_type_id " = (?)' ,
226- WorkItems ::Type . by_type ( types . first ) . select ( :correct_id ) . limit ( 1 )
225+ '"issues"."work_item_type_id " = (?)' ,
226+ WorkItems ::Type . by_type ( types . first ) . select ( :id ) . limit ( 1 )
227227 )
228228 }
229229 scope :without_issue_type , -> ( types ) {
230- joins ( :: Gitlab :: Issues :: TypeAssociationGetter . call ) . where . not ( work_item_types : { base_type : types } )
230+ joins ( :work_item_type ) . where . not ( work_item_types : { base_type : types } )
231231 }
232232
233233 scope :public_only , -> { where ( confidential : false ) }
@@ -242,10 +242,10 @@ def most_recent
242242
243243 scope :service_desk , -> {
244244 where (
245- "(author_id = ? AND correct_work_item_type_id = ?) OR correct_work_item_type_id = ?" ,
245+ "(author_id = ? AND work_item_type_id = ?) OR work_item_type_id = ?" ,
246246 Users ::Internal . support_bot . id ,
247- WorkItems ::Type . default_issue_type . correct_id ,
248- WorkItems ::Type . default_by_type ( :ticket ) . correct_id
247+ WorkItems ::Type . default_issue_type . id ,
248+ WorkItems ::Type . default_by_type ( :ticket ) . id
249249 )
250250 }
251251 scope :inc_relations_for_view , -> do
@@ -277,7 +277,7 @@ def most_recent
277277 scope :with_projects_matching_search_data , -> { where ( 'issue_search_data.project_id = issues.project_id' ) }
278278
279279 scope :with_work_item_type , -> {
280- joins ( :: Gitlab :: Issues :: TypeAssociationGetter . call )
280+ joins ( :work_item_type )
281281 }
282282
283283 before_validation :ensure_namespace_id , :ensure_work_item_type
@@ -359,30 +359,12 @@ def self.participant_includes
359359 [ :assignees ] + super
360360 end
361361
362- # TODO: https://gitlab.com/gitlab-org/gitlab/-/issues/499911
363- def work_item_type
364- correct_work_item_type
365- end
366-
367- # TODO: https://gitlab.com/gitlab-org/gitlab/-/issues/499911
368- def work_item_type_id
369- correct_work_item_type &.id
370- end
371-
372362 def work_item_type_id = ( input_work_item_type_id )
373- work_item_type = WorkItems ::Type . find_by_correct_id_with_fallback ( input_work_item_type_id )
374-
375- self . correct_work_item_type_id = work_item_type &.correct_id
363+ work_item_type = WorkItems ::Type . find_by_id_with_fallback ( input_work_item_type_id )
376364
377365 super ( work_item_type &.id )
378366 end
379367
380- def work_item_type = ( work_item_type )
381- self . correct_work_item_type = work_item_type
382-
383- super
384- end
385-
386368 def next_object_by_relative_position ( ignoring : nil , order : :asc )
387369 array_mapping_scope = -> ( id_expression ) do
388370 relation = Issue . where ( Issue . arel_table [ :project_id ] . eq ( id_expression ) )
@@ -928,18 +910,16 @@ def ensure_namespace_id
928910 end
929911
930912 def ensure_work_item_type
931- return if work_item_type . present? ||
932- correct_work_item_type_id . present? ||
933- correct_work_item_type_id_change &.last . present?
913+ return if work_item_type . present? || work_item_type_id . present? || work_item_type_id_change &.last . present?
934914
935915 self . work_item_type = WorkItems ::Type . default_by_type ( DEFAULT_ISSUE_TYPE )
936916 end
937917
938918 def allowed_work_item_type_change
939- return unless changes [ :correct_work_item_type_id ]
919+ return unless changes [ :work_item_type_id ]
940920
941921 involved_types = WorkItems ::Type . where (
942- correct_id : changes [ :correct_work_item_type_id ] . compact
922+ id : changes [ :work_item_type_id ] . compact
943923 ) . pluck ( :base_type ) . uniq
944924 disallowed_types = involved_types - WorkItems ::Type ::CHANGEABLE_BASE_TYPES
945925
0 commit comments