diff --git a/LICENSE b/LICENSE index 3c7592f..4eb1836 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2022 Vergara Technologies LLC +Copyright (c) 2023 Vergara Technologies LLC ======================================================= Bootstrap Open Source Licence ("BOSL") v. 1.0 diff --git a/package.yaml b/package.yaml index 8c5b0b3..1e68947 100644 --- a/package.yaml +++ b/package.yaml @@ -112,7 +112,6 @@ executables: - warp-tls - warp - tests: zgo-backend-test: main: Spec.hs diff --git a/src/Owner.hs b/src/Owner.hs index fbbeaa6..c9dba61 100644 --- a/src/Owner.hs +++ b/src/Owner.hs @@ -292,3 +292,9 @@ findOwner zaddy = findOne (select ["address" =: zaddy] "owners") findOwnerById :: T.Text -> Action IO (Maybe Document) findOwnerById i = findOne (select ["_id" =: (read (T.unpack i) :: ObjectId)] "owners") + +-- | Function to find Owners about to expire +findExpiringOwners :: UTCTime -> Action IO [Document] +findExpiringOwners now = + rest =<< + find (select ["expiration" =: ["$lte" =: addUTCTime 1728000 now]] "owners") diff --git a/stack.yaml b/stack.yaml index 27fad16..1b263b1 100644 --- a/stack.yaml +++ b/stack.yaml @@ -17,7 +17,7 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: lts-19.33 +resolver: lts-20.8 #url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/4.yaml # User packages to be built. diff --git a/stack.yaml.lock b/stack.yaml.lock index ad88f96..7ed2b05 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -24,7 +24,7 @@ packages: hackage: blake3-0.2@sha256:d1146b9a51ccfbb0532780778b6d016a614e3d44c05d8c1923dde9a8be869045,2448 snapshots: - completed: - sha256: 6d1532d40621957a25bad5195bfca7938e8a06d923c91bc52aa0f3c41181f2d4 - size: 619204 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/33.yaml - original: lts-19.33 + sha256: bfafe5735ccb74527d754b1f9999ded72d7c3a6c3a88529449661431ccfbd6cc + size: 649327 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/8.yaml + original: lts-20.8 diff --git a/zgo-backend.cabal b/zgo-backend.cabal index 34fee47..009552c 100644 --- a/zgo-backend.cabal +++ b/zgo-backend.cabal @@ -5,9 +5,9 @@ cabal-version: 1.12 -- see: https://github.com/sol/hpack name: zgo-backend -version: 1.1.1 +version: 1.2.0 synopsis: Haskell Back-end for the ZGo point-of-sale application -description: Please see the README on GitLab at +description: Please see the README at category: Web author: Rene Vergara maintainer: rene@vergara.network @@ -22,7 +22,7 @@ extra-source-files: source-repository head type: git - location: https://gitlab.com/pitmutt/zgo-backend + location: https://git.vergara.tech/Vergara_Tech/zgo-backend library exposed-modules: @@ -78,6 +78,7 @@ library executable zgo-backend-exe main-is: Server.hs other-modules: + Notify TokenRefresh Paths_zgo_backend hs-source-dirs: @@ -101,9 +102,27 @@ executable zgo-backend-exe , zgo-backend default-language: Haskell2010 +executable zgo-notifier + main-is: Notify.hs + other-modules: + Server + TokenRefresh + Paths_zgo_backend + hs-source-dirs: + app + ghc-options: -main-is Notify -threaded -rtsopts -with-rtsopts=-N -Wall + build-depends: + base >=4.7 && <5 + , mongoDB + , time + , warp + , zgo-backend + default-language: Haskell2010 + executable zgo-token-refresh main-is: TokenRefresh.hs other-modules: + Notify Server Paths_zgo_backend hs-source-dirs: