Skip to content

Commit ec1049d

Browse files
authored
chore(EE): Update export audit log for user names (#632)
1 parent 0bfdee3 commit ec1049d

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

server/enterprise/app/contracts/enterprise_export_audit_log_contracts.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ class Index < Dry::Validation::Contract
55
params do
66
optional(:start_date).maybe(:time)
77
optional(:end_date).maybe(:time)
8-
optional(:user_id).maybe(:integer)
9-
optional(:resource_type).maybe(:string)
8+
optional(:user_id).maybe(array[:integer])
9+
optional(:resource_type).maybe(array[:string])
1010
optional(:resource).maybe(:string)
1111
end
1212
end

server/enterprise/app/interactors/audit_logs/export_audit_log.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ def call
1717
def generate_csv(audit_logs)
1818
CSV.generate(headers: true) do |csv|
1919
# Define the headers
20-
csv << %w[User_ID Action Resource_Type Resource_ID Workspace_ID Timestamp]
20+
csv << %w[User_ID User_Name Action Resource_Type Resource_ID Workspace_ID Timestamp]
2121
# Add each audit log row to the CSV
2222
audit_logs.find_each do |log|
2323
csv << [
2424
log.user_id,
25+
log.user.name,
2526
log.action,
2627
log.resource_type,
2728
log.resource_id,

server/spec/enterprise/contracts/enterprise_export_audit_log_contracts_spec.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
{
1111
start_date: "2024-10-21",
1212
end_date: "2024-10-21",
13-
user_id: 1,
14-
resource_type: "Sync",
13+
user_id: [1],
14+
resource_type: ["Sync"],
1515
resource: "Test_sync"
1616
}
1717
end
@@ -28,8 +28,8 @@
2828
{
2929
start_date: "2024-10-21",
3030
end_date: "2024-10-21",
31-
user_id: 1,
32-
resource_type: "Sync"
31+
user_id: [1],
32+
resource_type: ["Sync"]
3333
}
3434
end
3535

server/spec/enterprise/interactors/audit_logs/export_audit_logs_spec.rb

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
result = described_class.call(mock_context)
3636
expect(result).to be_a_success
3737
expect(result.csv_data).to include("User_ID")
38+
expect(result.csv_data).to include("User_Name")
3839
expect(result.csv_data).to include("Action")
3940
expect(result.csv_data).to include("Resource_Type")
4041
expect(result.csv_data).to include("Resource_ID")

0 commit comments

Comments
 (0)