nuttycom/aftok - Change XXJFUZOVELM3KIPRU6C2NHB3YQ3B3A3GGF2YYBTYJGPU3PR2OV4AC

Add first revenue date to project payout computation.

Created by Kris Nuttycombe on January 31, 2021

XXJFUZOVELM3KIPRU6C2NHB3YQ3B3A3GGF2YYBTYJGPU3PR2OV4AC

Dependencies

In channels

main

Change contents

Replacement in lib/Aftok/Database/PostgreSQL/Projects.hs at line 34 [3.47497]
B:BD[3.48044] → [3.48044:48054]
```
    depf,
```
[3.48044]
[3.48054]
```
    depRules,
```
Insertion in lib/Aftok/Database/PostgreSQL/Projects.hs at line 48 [3.47497]
[3.48248]
[3.48248]
```
    DepreciationRules(..),
    depf
```

Replacement in lib/Aftok/Database/PostgreSQL/Projects.hs at line 67 [3.47497]

B:BD[3.48730] → [3.48730:48785]

    <*> (unSerDepFunction <$> fieldWith fromJSONField)

[3.48730]

[3.48785]

    <*> (
      DepreciationRules
        <$> (unSerDepFunction <$> fieldWith fromJSONField)
        <*> (fmap C.toThyme <$> field)
        )

Replacement in lib/Aftok/Database/PostgreSQL/Projects.hs at line 91 [3.47497]
B:BD[3.49316] → [3.49316:49361]
```
      toJSON $ p ^. depf . to SerDepFunction
```
[3.49316]
[3.49361]
```
      toJSON $ p ^. depRules . depf . to SerDepFunction
```

Replacement in lib/Aftok/Database/PostgreSQL/Projects.hs at line 103 [3.47497]

B:BD[3.49605] → [3.49605:49714]

      [sql| SELECT project_name, inception_date, initiator_id, depreciation_fn FROM projects WHERE id = ? |]

[3.49605]

[3.49714]

      [sql| SELECT project_name, inception_date, initiator_id, depreciation_fn, first_revenue_date
            FROM projects WHERE id = ? |]

Replacement in lib/Aftok/Database/PostgreSQL/Projects.hs at line 112 [3.47497]

B:BD[3.49935] → [3.49935:50019]

          p.id, p.project_name, p.inception_date, p.initiator_id, p.depreciation_fn

[3.49935]

[3.50019]

          p.id, p.project_name, p.inception_date, p.initiator_id, p.depreciation_fn, p.first_revenue_date

Replacement in lib/Aftok/Payments/Util.hs at line 18 [3.79668]
B:BD[3.80035] → [3.80035:80063]
```
import Aftok.Project (depf)
```
[3.80035]
[3.80063]
```
import Aftok.Project (depRules)
```

Replacement in lib/Aftok/Payments/Util.hs at line 37 [3.79668]

B:BD[3.80612] → [3.80612:80674]

  pure $ TL.payouts (TL.toDepF $ project' ^. depf) ptime widx

[3.80612]

[3.80674]

  pure $ TL.payouts (TL.toDepF $ project' ^. depRules) ptime widx

Replacement in lib/Aftok/Project.hs at line 25 [5.1031]
B:BD[4.49549] → [4.49549:49587]
```
        _depf :: DepreciationFunction
```
[4.49549]
[4.49587]
```
        _depRules :: DepreciationRules
```
Insertion in lib/Aftok/TimeLog.hs at line 20 [7.846]
[6.22356]
[6.22356]
```
    DepreciationRules(..),
```

Replacement in lib/Aftok/TimeLog.hs at line 139 [7.846]

B:BD[8.327] → [8.327:397]

type DepF = Maybe C.UTCTime -> C.UTCTime -> Interval C.UTCTime -> NDT

[8.327]

[8.397]

type DepF = C.UTCTime -> Interval C.UTCTime -> NDT

Replacement in lib/Aftok/TimeLog.hs at line 141 [7.846]

∅:D[8.398] → [9.9395:9434]

B:BD[7.2354] → [9.9395:9434]

B:BD[9.9434] → [10.12222:12317]

toDepF :: DepreciationFunction -> DepF
toDepF (LinearDepreciation undepLength depLength) =
  linearDepreciation undepLength depLength

[8.398]

[8.399]

toDepF :: DepreciationRules -> DepF
toDepF (DepreciationRules (LinearDepreciation undepLength depLength) firstRevenue)  =
  linearDepreciation firstRevenue undepLength depLength

Insertion in lib/Aftok/TimeLog.hs at line 151 [7.846]

[8.562]

  -- | The date of first revenue, if applicable
  Maybe C.UTCTime ->

Replacement in lib/Aftok/TimeLog.hs at line 159 [7.846]
B:BD[8.796] → [8.796:835]
```
linearDepreciation undepDays depDays =
```
[8.796]
[8.835]
```
linearDepreciation firstRevenue undepDays depDays =
```
Replacement in lib/Aftok/TimeLog.hs at line 170 [7.846]
B:BD[8.1289] → [8.1289:1328]
```
   in \firstRevenue payoutDate ival ->
```
[8.1289]
[8.1328]
```
   in \payoutDate ival ->
```

Replacement in lib/Aftok/TimeLog.hs at line 183 [7.846]

B:BD[2.190] → [2.190:294]

  let intervalCredit ival = (Sum . ilen &&& Sum . depf Nothing payoutDate) $ fmap (view eventTime) ival

[2.190]

[8.1793]

  let intervalCredit ival = (Sum . ilen &&& Sum . depf payoutDate) $ fmap (view eventTime) ival

Insertion in lib/Aftok/Types.hs at line 65 [12.805]

[11.33998]


data DepreciationRules = DepreciationRules
  { _depf :: DepreciationFunction
  , _firstRevenue :: Maybe C.UTCTime
  }
makeLenses ''DepreciationRules

File addition: 2021-01-31_23-40-41_project_first_revenue.txt (----------)

[13.1]

Description: (Describe migration here.)
Created: 2021-01-31 23:40:52.022174268 UTC
Depends: 2016-10-13_05-36-55_user-event-log
Apply: |
  alter table projects add column first_revenue_date timestamp with time zone;

Replacement in server/Aftok/Snaplet/Projects.hs at line 88 [16.2363]
∅:D[14.53725] → [15.8871:8935]
∅:D[4.64295] → [15.8871:8935]
B:BD[15.8871] → [15.8871:8935]
```
  snapEval . createProject $ Project (cpn cp) t uid (cpdepf cp)
```
[4.64295]
[16.3442]
```
  snapEval . createProject $ Project (cpn cp) t uid (DepreciationRules (cpdepf cp) Nothing)
```
Replacement in server/Aftok/Snaplet/Projects.hs at line 113 [16.2363]
B:BD[6.25680] → [6.25680:25736]
```
  let p = payouts (toDepF $ project ^. depf) ptime widx
```
[6.25680]
[6.25736]
```
  let p = payouts (toDepF $ project ^. depRules) ptime widx
```
Replacement in server/Aftok/Snaplet/Projects.hs at line 149 [16.2363]
B:BD[6.26895] → [6.26895:26950]
```
  pure $ payouts (toDepF $ project ^. depf) ptime widx
```
[6.26895]
[15.8936]
```
  pure $ payouts (toDepF $ project ^. depRules) ptime widx
```
Replacement in server/Aftok/Snaplet/Projects.hs at line 224 [16.2363]
B:BD[6.27363] → [6.27363:27402]
```
      "depf" .= depfToJSON (p ^. depf)
```
[6.27363]
[6.27402]
```
      "depf" .= depfToJSON (p ^. depRules . depf)
```

Add first revenue date to project payout computation.

Dependencies

In channels

Change contents

Replacement in lib/Aftok/Database/PostgreSQL/Projects.hs at line 34 [3.47497]

Insertion in lib/Aftok/Database/PostgreSQL/Projects.hs at line 48 [3.47497]

Replacement in lib/Aftok/Database/PostgreSQL/Projects.hs at line 67 [3.47497]

Replacement in lib/Aftok/Database/PostgreSQL/Projects.hs at line 91 [3.47497]

Replacement in lib/Aftok/Database/PostgreSQL/Projects.hs at line 103 [3.47497]

Replacement in lib/Aftok/Database/PostgreSQL/Projects.hs at line 112 [3.47497]

Replacement in lib/Aftok/Payments/Util.hs at line 18 [3.79668]

Replacement in lib/Aftok/Payments/Util.hs at line 37 [3.79668]

Replacement in lib/Aftok/Project.hs at line 25 [5.1031]

Insertion in lib/Aftok/TimeLog.hs at line 20 [7.846]

Replacement in lib/Aftok/TimeLog.hs at line 139 [7.846]

Replacement in lib/Aftok/TimeLog.hs at line 141 [7.846]

Insertion in lib/Aftok/TimeLog.hs at line 151 [7.846]

Replacement in lib/Aftok/TimeLog.hs at line 159 [7.846]

Replacement in lib/Aftok/TimeLog.hs at line 170 [7.846]

Replacement in lib/Aftok/TimeLog.hs at line 183 [7.846]

Insertion in lib/Aftok/Types.hs at line 65 [12.805]

File addition: 2021-01-31_23-40-41_project_first_revenue.txt (----------)

Replacement in server/Aftok/Snaplet/Projects.hs at line 88 [16.2363]

Replacement in server/Aftok/Snaplet/Projects.hs at line 113 [16.2363]

Replacement in server/Aftok/Snaplet/Projects.hs at line 149 [16.2363]

Replacement in server/Aftok/Snaplet/Projects.hs at line 224 [16.2363]