Merge branch '347473-fix-add-spent-time-api' into 'master'

Set spent time when using timelogs API

See merge request gitlab-org/gitlab!76400

db/migrate/20211213130324_update_timelogs_spent_at_default.rb

+# frozen_string_literal: true
+
+class UpdateTimelogsSpentAtDefault < Gitlab::Database::Migration[1.0]
+  def change
+    change_column_default(:timelogs, :spent_at, from: nil, to: -> { 'NOW()' })
+  end
+end

db/schema_migrations/20211213130324

+2267855b2f12747b1f31f392677fac4d4f82ee234d7c54fd209b8bad417c8c75
\ No newline at end of file

db/structure.sql

@@ -19916,7 +19916,7 @@ CREATE TABLE timelogs (
     updated_at timestamp without time zone NOT NULL,
     issue_id integer,
     merge_request_id integer,
-    spent_at timestamp without time zone,
+    spent_at timestamp without time zone DEFAULT now(),
     note_id integer,
     project_id integer,
     summary text,

spec/models/timelog_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe Timelog do
 
   it { expect(subject.project_id).not_to be_nil }
 
-  describe 'Issuable validation' do
+  describe 'validation' do
     it 'is invalid if issue_id and merge_request_id are missing' do
       subject.attributes = { issue: nil, merge_request: nil }
 
@@ -139,4 +139,14 @@ RSpec.describe Timelog do
       time + 1.day
     end
   end
+
+  describe 'hooks' do
+    describe '.set_project' do
+      it 'populates project with issuable project' do
+        timelog = create(:issue_timelog, issue: issue)
+
+        expect(timelog.project_id).to be(timelog.issue.project_id)
+      end
+    end
+  end
 end