Skip to content

Commit e361e9e

Browse files
lastcanallastcanal
committed
remove ecto fork
1 parent b545cec commit e361e9e

File tree

27 files changed

+61
-121
lines changed

27 files changed

+61
-121
lines changed

‎lib/algora/accounts/schemas/identity.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ defmodule Algora.Accounts.Identity do
1818

1919
belongs_to :user, User
2020

21-
has_many :activities, {"identity_activities", Activity}, foreign_key: :assoc_id, on_replace: :ignore
21+
has_many :activities, {"identity_activities", Activity}, foreign_key: :assoc_id
2222

2323
timestamps()
2424
end

‎lib/algora/accounts/schemas/user.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ defmodule Algora.Accounts.User do
8686
has_many :connected_installations, Installation, foreign_key: :connected_user_id
8787
has_many :contractor_contracts, Contract, foreign_key: :contractor_id
8888
has_many :client_contracts, Contract, foreign_key: :client_id
89-
has_many :activities, {"user_activities", Activity}, foreign_key: :assoc_id, on_replace: :ignore
89+
has_many :activities, {"user_activities", Activity}, foreign_key: :assoc_id
9090

9191
has_one :customer, Algora.Payments.Customer, foreign_key: :user_id
9292

‎lib/algora/activities/activities.ex‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,18 @@ defmodule Algora.Activities do
1212
:bonus_activities,
1313
:bounty_activities,
1414
:claim_activities,
15-
# :prize_pool_activities,
1615
:tip_activities,
1716
:message_activities,
18-
# :participant_activities,
1917
:thread_activities,
20-
# :comment_cursor_activities,
2118
:contract_activities,
2219
:timesheet_activities,
23-
# :event_cursor_activities,
24-
# :member_activities,
25-
# :org_activities,
20+
:application_activities,
21+
:job_activities,
2622
:account_activities,
2723
:customer_activities,
2824
:payment_method_activities,
2925
:platform_transaction_activities,
30-
# :transaction_activities,
26+
:transaction_activities,
3127
:project_activities,
3228
:review_activities,
3329
:installation_activities,
@@ -49,6 +45,9 @@ defmodule Algora.Activities do
4945
:contractor_contracts
5046
]
5147

48+
def tables, do: @tables
49+
def user_attributes, do: @user_attributes
50+
5251
def base_query do
5352
[head | tail] = @tables
5453

‎lib/algora/bounties/schemas/attempt.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ defmodule Algora.Bounties.Attempt do
88
belongs_to :bounty, Algora.Bounties.Bounty
99
belongs_to :user, Algora.Accounts.User
1010

11-
has_many :activities, {"attempt_activities", Activity}, foreign_key: :assoc_id, on_replace: :ignore
11+
has_many :activities, {"attempt_activities", Activity}, foreign_key: :assoc_id
1212

1313
timestamps()
1414
end

‎lib/algora/bounties/schemas/claim.ex‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ defmodule Algora.Bounties.Claim do
3030
belongs_to :user, Algora.Accounts.User
3131
# has_one :transaction, Algora.Payments.Transaction
3232

33-
has_many :activities, {"claim_activities", Activity}, foreign_key: :assoc_id, on_replace: :ignore
34-
33+
has_many :activities, {"claim_activities", Activity}, foreign_key: :assoc_id
3534
timestamps()
3635
end
3736

‎lib/algora/bounties/schemas/tip.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ defmodule Algora.Bounties.Tip do
1515
belongs_to :recipient, User
1616
has_many :transactions, Algora.Payments.Transaction
1717

18-
has_many :activities, {"tip_activities", Activity}, foreign_key: :assoc_id, on_replace: :ignore
18+
has_many :activities, {"tip_activities", Activity}, foreign_key: :assoc_id
1919

2020
timestamps()
2121
end

‎lib/algora/chat/schemas/message.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ defmodule Algora.Chat.Message do
1010
belongs_to :thread, Algora.Chat.Thread
1111
belongs_to :sender, Algora.Accounts.User
1212

13-
has_many :activities, {"message_activities", Activity}, foreign_key: :assoc_id, on_replace: :ignore
13+
has_many :activities, {"message_activities", Activity}, foreign_key: :assoc_id
1414

1515
timestamps()
1616
end

‎lib/algora/chat/schemas/thread.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ defmodule Algora.Chat.Thread do
99

1010
has_many :messages, Algora.Chat.Message
1111
has_many :participants, Algora.Chat.Participant
12-
has_many :activities, {"thread_activities", Activity}, foreign_key: :assoc_id, on_replace: :ignore
12+
has_many :activities, {"thread_activities", Activity}, foreign_key: :assoc_id
1313

1414
timestamps()
1515
end

‎lib/algora/contracts/contracts.ex‎

Lines changed: 20 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
defmodule Algora.Contracts do
22
@moduledoc false
3-
import Algora.Activities.Activity, only: [put_activity: 2]
43
import Ecto.Changeset
54
import Ecto.Query
65

@@ -172,20 +171,16 @@ defmodule Algora.Contracts do
172171
total_fee: total_fee,
173172
line_items: line_items
174173
})
175-
|> put_assoc(
176-
:contract,
177-
put_activity(contract, %{
178-
type: :transaction_created
179-
})
180-
)
181174
|> Algora.Validations.validate_positive(:gross_amount)
182175
|> Algora.Validations.validate_positive(:net_amount)
183176
|> Algora.Validations.validate_positive(:total_fee)
184177
|> foreign_key_constraint(:original_contract_id)
185178
|> foreign_key_constraint(:contract_id)
186179
|> foreign_key_constraint(:timesheet_id)
187180
|> foreign_key_constraint(:user_id)
188-
|> Repo.insert()
181+
|> Repo.insert_with_activity(%{
182+
type: :transaction_created
183+
})
189184
end
190185

191186
defp initialize_debit(%{id: id, contract: contract, amount: amount, linked_transaction_id: linked_transaction_id}) do
@@ -204,19 +199,15 @@ defmodule Algora.Contracts do
204199
total_fee: Money.zero(:USD),
205200
linked_transaction_id: linked_transaction_id
206201
})
207-
|> put_assoc(
208-
:contract,
209-
put_activity(contract, %{
210-
type: :transaction_created
211-
})
212-
)
213202
|> Algora.Validations.validate_positive(:gross_amount)
214203
|> Algora.Validations.validate_positive(:net_amount)
215204
|> foreign_key_constraint(:original_contract_id)
216205
|> foreign_key_constraint(:contract_id)
217206
|> foreign_key_constraint(:timesheet_id)
218207
|> foreign_key_constraint(:user_id)
219-
|> Repo.insert()
208+
|> Repo.insert_with_activity(%{
209+
type: :transaction_created
210+
})
220211
end
221212

222213
defp initialize_credit(%{id: id, contract: contract, amount: amount, linked_transaction_id: linked_transaction_id}) do
@@ -235,19 +226,15 @@ defmodule Algora.Contracts do
235226
user_id: contract.contractor_id,
236227
linked_transaction_id: linked_transaction_id
237228
})
238-
|> put_assoc(
239-
:contract,
240-
put_activity(contract, %{
241-
type: :transaction_created
242-
})
243-
)
244229
|> Algora.Validations.validate_positive(:gross_amount)
245230
|> Algora.Validations.validate_positive(:net_amount)
246231
|> foreign_key_constraint(:original_contract_id)
247232
|> foreign_key_constraint(:contract_id)
248233
|> foreign_key_constraint(:timesheet_id)
249234
|> foreign_key_constraint(:user_id)
250-
|> Repo.insert()
235+
|> Repo.insert_with_activity(%{
236+
type: :transaction_created
237+
})
251238
end
252239

253240
defp initialize_transfer(%{contract: contract, amount: amount}) do
@@ -265,19 +252,15 @@ defmodule Algora.Contracts do
265252
timesheet_id: contract.timesheet.id,
266253
user_id: contract.contractor_id
267254
})
268-
|> put_assoc(
269-
:contract,
270-
put_activity(contract, %{
271-
type: :transaction_created
272-
})
273-
)
274255
|> Algora.Validations.validate_positive(:gross_amount)
275256
|> Algora.Validations.validate_positive(:net_amount)
276257
|> foreign_key_constraint(:original_contract_id)
277258
|> foreign_key_constraint(:contract_id)
278259
|> foreign_key_constraint(:timesheet_id)
279260
|> foreign_key_constraint(:user_id)
280-
|> Repo.insert()
261+
|> Repo.insert_with_activity(%{
262+
type: :transaction_created
263+
})
281264
end
282265

283266
defp initialize_prepayment_transaction(contract) do
@@ -529,14 +512,10 @@ defmodule Algora.Contracts do
529512
provider_meta: Util.normalize_struct(%{error: error}),
530513
status: :failed
531514
})
532-
|> put_assoc(
533-
:contract,
534-
put_activity(transaction.contract, %{
535-
type: :transaction_status_change,
536-
meta: %{status: :failed, transaction_id: transaction.id}
537-
})
538-
)
539-
|> Repo.update()
515+
|> Repo.update_with_activity(%{
516+
type: :transaction_status_change,
517+
meta: %{status: :failed, transaction_id: transaction.id}
518+
})
540519
end
541520

542521
defp update_transaction_status(transaction, record, status) do
@@ -547,14 +526,10 @@ defmodule Algora.Contracts do
547526
status: status,
548527
succeeded_at: if(status == :succeeded, do: DateTime.utc_now())
549528
})
550-
|> put_assoc(
551-
:contract,
552-
put_activity(transaction.contract, %{
553-
type: :transaction_status_change,
554-
meta: %{status: status, transaction_id: transaction.id}
555-
})
556-
)
557-
|> Repo.update()
529+
|> Repo.update_with_activity(%{
530+
type: :transaction_status_change,
531+
meta: %{status: status, transaction_id: transaction.id}
532+
})
558533
end
559534

560535
defp mark_contract_as_paid(contract) do
@@ -579,10 +554,6 @@ defmodule Algora.Contracts do
579554
hourly_rate: contract.hourly_rate,
580555
hours_per_week: contract.hours_per_week
581556
})
582-
# |> put_activity(contract, %{
583-
# type: :contract_renewed,
584-
# trace_id: Nanoid.generate()
585-
# })
586557
|> Repo.insert_with_activity(%{
587558
type: :contract_renewed,
588559
trace_id: Nanoid.generate()

‎lib/algora/contracts/schemas/contract.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ defmodule Algora.Contracts.Contract do
3737
has_many :reviews, Algora.Reviews.Review
3838
has_one :timesheet, Algora.Contracts.Timesheet
3939

40-
has_many :activities, {"contract_activities", Activity}, foreign_key: :assoc_id, on_replace: :ignore
40+
has_many :activities, {"contract_activities", Activity}, foreign_key: :assoc_id
4141

4242
timestamps()
4343
end

0 commit comments

Comments
 (0)