Add handling for tasks that are subtracted from hour balance.

.env.example

@@ -5,4 +5,5 @@ CLIENT_SECRET=<harvest_api_client_secret>
 CALLBACK_URL=<harvest_api_redirect_uri>
 ORGANIZATION=<your_harvest_organization>
 IGNORE_TASK_IDS=<comma-separated_task_ids>
+SUBTRACT_TASK_IDS=<comma-separated_task_ids>
 START_DATE=YYYYMMDD

server/server.js

@@ -30,7 +30,7 @@ app.use(session({
     })
 }));
 
-const forceSsl = function(req, res, next) {
+const forceSsl = function (req, res, next) {
     if (req.headers['x-forwarded-proto'] !== 'https') {
         return res.redirect(['https://', req.get('Host'), req.url].join(''));
     }
@@ -42,11 +42,11 @@ app.use(passport.initialize());
 app.use(passport.session());
 app.use(forceSsl);
 
-passport.serializeUser(function(user, done) {
+passport.serializeUser(function (user, done) {
     done(null, user);
 });
 
-passport.deserializeUser(function(user, done) {
+passport.deserializeUser(function (user, done) {
     done(null, user);
 });
 
@@ -60,7 +60,7 @@ passport.use(
             callbackURL: process.env.CALLBACK_URL
         },
         // TODO: handle refresh tokens
-        function(accessToken, refreshToken, profile, done) {
+        function (accessToken, refreshToken, profile, done) {
             request
                 .get(`${Api.harvestUrl}/account/who_am_i`)
                 .type('json')
@@ -102,18 +102,18 @@ app.all('*', ensureAuthenticated);
 
 app.use('/', express.static(__dirname + '/static'));
 
-app.get('/user', function(req, res) {
+app.get('/user', function (req, res) {
     if (req.isAuthenticated()) {
         const sessionUser = req.session.passport.user;
         User.findOne(
             { id: sessionUser.id },
             (err, doc) => {
-                if(err) {
+                if (err) {
                     console.error(err);
                 }
 
                 let previousBalance = 0;
-                if(doc && doc.previousBalance) {
+                if (doc && doc.previousBalance) {
                     previousBalance = doc.previousBalance;
                 }
 
@@ -127,28 +127,34 @@ app.get('/user', function(req, res) {
     }
 });
 
-app.get('/holidays', function(req, res) {
+app.get('/holidays', function (req, res) {
     const options = {
         root: __dirname + '/static'
     };
     res.sendFile('finnish_holidays.json', options);
 });
 
-app.get('/entries', function(req, res) {
+app.get('/entries', function (req, res) {
     Api.fetchHourEntries(req, res)
         .then(entries => res.send(entries));
 });
 
-app.get('/ignored_tasks', function(req, res) {
-    res.send(process.env.IGNORE_TASK_IDS
+function idStringToTasks(taskIds) {
+    return taskIds
         .split(',')
         .map(taskId => {
             return { taskId: parseInt(taskId) }
         })
-    );
+}
+
+app.get('/special_tasks', function (req, res) {
+    res.send({
+        ignore: idStringToTasks(process.env.IGNORE_TASK_IDS),
+        subtract: idStringToTasks(process.env.SUBTRACT_TASK_IDS)
+    });
 });
 
-app.post('/balance', function(req, res) {
+app.post('/balance', function (req, res) {
     if (req.isAuthenticated()) {
         const sessionUser = req.session.passport.user;
         upsertUser(sessionUser.id, req.body.balance);
@@ -162,7 +168,7 @@ const upsertUser = (id, balance) => {
         { previousBalance: balance },
         { new: true, upsert: true },
         (err, doc) => {
-            if(err) {
+            if (err) {
                 console.error(err);
             }
         }
@@ -173,6 +179,6 @@ const port = process.env.PORT || 8080;
 app.listen(port);
 console.log('Server listening in port: ' + port);
 
-process.on('uncaughtException', function(error) {
+process.on('uncaughtException', function (error) {
     console.log(error.stack);
 });

src/Api.elm

@@ -56,16 +56,25 @@ decodeHolidays =
         )
 
 
-getIgnoredTasks : Task Error (List HarvestTask)
-getIgnoredTasks =
-    Http.get decodeTasks "/ignored_tasks"
+getSpecialTasks : Task Error SpecialTasks
+getSpecialTasks =
+    Http.get decodeTasks "/special_tasks"
 
 
-decodeTasks : Json.Decoder (List HarvestTask)
+decodeTasks : Json.Decoder SpecialTasks
 decodeTasks =
-    list
-        (object1 HarvestTask
-            ("taskId" := int)
+    object2 SpecialTasks
+        ("ignore"
+            := list
+                (object1 HarvestTask
+                    ("taskId" := int)
+                )
+        )
+        ("subtract"
+            := list
+                (object1 HarvestTask
+                    ("taskId" := int)
+                )
         )
 
 

src/DateUtils.elm

@@ -55,14 +55,16 @@ dateInCurrentMonth date currentDate =
 
 hoursForDate : DateEntries -> Model -> List Float
 hoursForDate dateEntries model =
-    List.map (\entry -> entryHours entry model.ignoredTasks)
+    List.map (\entry -> entryHours entry model.specialTasks)
         dateEntries.entries
 
 
-entryHours : Entry -> List HarvestTask -> Float
-entryHours entry ignoredTasks =
-    if List.any (\t -> t.id == entry.taskId) ignoredTasks then
+entryHours : Entry -> SpecialTasks -> Float
+entryHours entry specialTasks =
+    if List.any (\t -> t.id == entry.taskId) specialTasks.ignore then
         0
+    else if List.any (\t -> t.id == entry.taskId) specialTasks.subtract then
+        -entry.hours
     else
         entry.hours
 

src/Main.elm

@@ -26,7 +26,7 @@ init =
         , Update.getUser
         , Update.getEntries
         , Update.getHolidays
-        , Update.getIgnoredTasks
+        , Update.getSpecialTasks
         ]
     )
 
@@ -42,7 +42,10 @@ initialModel =
     , hourBalanceOfCurrentMonth = Nothing
     , user = { firstName = "", lastName = "", previousBalance = 0 }
     , holidays = []
-    , ignoredTasks = []
+    , specialTasks =
+        { ignore = []
+        , subtract = []
+        }
     , previousBalanceString = ""
     , previousBalance = 0
     , mdl = Material.model

src/Model.elm

@@ -15,7 +15,7 @@ type alias Model =
     , hourBalanceOfCurrentMonth : Maybe Float
     , user : User
     , holidays : List Holiday
-    , ignoredTasks : List HarvestTask
+    , specialTasks : SpecialTasks
     , previousBalanceString : String
     , previousBalance : Float
     , mdl : Material.Model
@@ -49,3 +49,9 @@ type alias Holiday =
 
 type alias HarvestTask =
     { id : Int }
+
+
+type alias SpecialTasks =
+    { ignore : List HarvestTask
+    , subtract : List HarvestTask
+    }

src/Update.elm

@@ -24,7 +24,7 @@ type Msg
     | PreviousMonth
     | NextMonth
     | UpdateHourBalanceOfCurrentMonth
-    | FetchedIgnoredTaskList (Result Http.Error (List HarvestTask))
+    | FetchedSpecialTaskList (Result Http.Error SpecialTasks)
     | SetCurrentTime (Time.Time)
     | UpdatePreviousBalance String
     | SavePreviousBalance Float
@@ -75,7 +75,7 @@ update action model =
                 not
                     (isEmpty model.entries
                         || isEmpty model.holidays
-                        || isEmpty model.ignoredTasks
+                        || isEmpty model.specialTasks.ignore
                     )
             then
                 let
@@ -95,10 +95,10 @@ update action model =
         UpdateHourBalanceOfCurrentMonth ->
             noFx { model | hourBalanceOfCurrentMonth = Just (hourBalanceOfCurrentMonth model) }
 
-        FetchedIgnoredTaskList result ->
+        FetchedSpecialTaskList result ->
             case result of
                 Ok tasks ->
-                    update UpdateHours { model | ignoredTasks = tasks }
+                    update UpdateHours { model | specialTasks = tasks }
 
                 Err error ->
                     handleError model error
@@ -171,6 +171,6 @@ getHolidays =
     getResult Api.getNationalHolidays FetchedHolidays
 
 
-getIgnoredTasks : Cmd Msg
-getIgnoredTasks =
-    getResult Api.getIgnoredTasks FetchedIgnoredTaskList
+getSpecialTasks : Cmd Msg
+getSpecialTasks =
+    getResult Api.getSpecialTasks FetchedSpecialTaskList