[cache] last modification header cache: first drafts

README.md

@@ -121,3 +121,19 @@ Then you can log in with `user1:1resu`.
 
 stack --docker exec gargantext-cli -- CorpusFromGarg.csv ListFromGarg.csv Ouput.json
 
+
+Haskell fused-effects-profile
+https://www.simplehaskell.org/
+## REPL tips
+
+Some tips to use the Haskell REPL.
+
+### Query database for node
+
+``` haskell
+:set -XFlexibleContexts
+:m + Data.Aeson
+:m + Data.Proxy
+let getN n = getNode n  :: Cmd GargError (Gargantext.Core.Types.Node Value)
+runCmdRepl $ getN <id>
+```

shell.nix

 { pkgs ? import ./pinned-19.09.nix {} }:
 
+let
+  hie = (import (pkgs.fetchFromGitHub {
+                   owner="domenkozar";
+                   repo="hie-nix";
+                   rev="e3113da";
+                   sha256="05rkzjvzywsg66iafm84xgjlkf27yfbagrdcb8sc9fd59hrzyiqk";
+                 }) {}).hie84;
+in
+
 pkgs.mkShell {
   buildInputs = with pkgs; [
     docker-compose
+    #hie
     #glibc
     #gmp
     #gsl

src/Gargantext/API/Metrics.hs

@@ -49,42 +49,42 @@ type ScatterAPI = Summary "SepGen IncExc metrics"
                   :> QueryParam  "list"       ListId
                   :> QueryParamR "ngramsType" TabType
                   :> QueryParam  "limit"      Int
-                  :> Get '[JSON] (HashedResponse Metrics)
+                  :> Header "If-Modified-Since" Text
+                  :> Get (Headers '[Servant.Header "Last-Modified"] Text Metrics)
               :<|> Summary "Scatter update"
                   :> QueryParam  "list"       ListId
                   :> QueryParamR "ngramsType" TabType
                   :> QueryParam  "limit"      Int
                   :> Post '[JSON] ()
-              :<|> "md5" :>
-                     Summary "Scatter MD5"
-                  :> QueryParam  "list"       ListId
-                  :> QueryParamR "ngramsType" TabType
-                  :> Get '[JSON] Text
 
 scatterApi :: NodeId -> GargServer ScatterAPI
 scatterApi id' = getScatter id'
             :<|> updateScatter id'
-            :<|> getScatterMD5 id'
 
 getScatter :: FlowCmdM env err m =>
   CorpusId
   -> Maybe ListId
   -> TabType
   -> Maybe Limit
-  -> m (HashedResponse Metrics)
-getScatter cId maybeListId tabType _maybeLimit = do
+  -> Maybe Text
+  -> m Metrics
+getScatter cId maybeListId tabType _maybeLimit mLMSent = do
   listId <- case maybeListId of
     Just lid -> pure lid
     Nothing  -> defaultList cId
   node <- getNodeWith listId (Proxy :: Proxy HyperdataList)
-  let HyperdataList { hd_scatter = mChart } = node ^. node_hyperdata
+  let HyperdataList { hd_scatter = mChart, hd_last_modified = mLM } = node ^. node_hyperdata
 
-  chart <- case mChart of
-    Just chart -> pure chart
-    Nothing    -> do
+  (chart, lastModified) <- case mLM of
+    Nothing -> do
       updateScatter' cId maybeListId tabType Nothing
+    Just lastModified ->
+      case mChart of
+        Nothing    -> do
+          updateScatter' cId maybeListId tabType Nothing
+        Just chart -> pure chart
 
-  pure $ constructHashedResponse chart
+  pure $ addHeader lastModified chart
 
 updateScatter :: FlowCmdM env err m =>
   CorpusId
@@ -396,4 +396,4 @@ getTreeMD5 :: FlowCmdM env err m =>
   -> m Text
 getTreeMD5 cId maybeListId tabType listType = do
   HashedResponse { md5 = md5' } <- getTree cId Nothing Nothing maybeListId tabType listType
-  pure md5'
\ No newline at end of file
+  pure md5'

src/Gargantext/Database/Admin/Types/Hyperdata.hs

@@ -233,6 +233,7 @@ data HyperdataList =
                 , hd_pie     :: !(Maybe (ChartMetrics Histo))
                 , hd_scatter :: !(Maybe Metrics)
                 , hd_tree    :: !(Maybe (ChartMetrics [MyTree]))
+                , hd_last_modified :: !(Maybe Text)
                 } deriving (Show, Generic)
 $(deriveJSON (unPrefix "hd_") ''HyperdataList)