Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Ecolyo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
web-et-numerique
Factory
LLLE_Project
Ecolyo
Commits
b4474245
Commit
b4474245
authored
1 year ago
by
Bastien DUMONT
Browse files
Options
Downloads
Patches
Plain Diff
remove explicit typing
parent
66de9795
No related branches found
No related tags found
2 merge requests
!1154
feat: GRDF consent email
,
!1137
feat(grdf)!: update error messages
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/services/fluid.service.ts
+39
-50
39 additions, 50 deletions
src/services/fluid.service.ts
with
39 additions
and
50 deletions
src/services/fluid.service.ts
+
39
−
50
View file @
b4474245
import
{
Client
}
from
'
cozy-client
'
import
{
Client
}
from
'
cozy-client
'
import
{
FluidState
,
FluidType
}
from
'
enums
'
import
{
FluidState
,
FluidType
}
from
'
enums
'
import
{
import
{
FluidStatus
,
Konnector
,
PartnersInfo
,
TriggerState
}
from
'
models
'
Account
,
FluidStatus
,
Konnector
,
PartnersInfo
,
Trigger
,
TriggerState
,
}
from
'
models
'
import
AccountService
from
'
services/account.service
'
import
AccountService
from
'
services/account.service
'
import
ConsumptionService
from
'
services/consumption.service
'
import
ConsumptionService
from
'
services/consumption.service
'
import
ConfigService
from
'
services/fluidConfig.service
'
import
ConfigService
from
'
services/fluidConfig.service
'
...
@@ -64,51 +57,47 @@ export default class FluidService {
...
@@ -64,51 +57,47 @@ export default class FluidService {
):
Promise
<
FluidStatus
[]
>
=>
{
):
Promise
<
FluidStatus
[]
>
=>
{
const
fluidConfig
=
new
ConfigService
().
getFluidConfig
()
const
fluidConfig
=
new
ConfigService
().
getFluidConfig
()
const
accountService
=
new
AccountService
(
this
.
_client
)
const
accountService
=
new
AccountService
(
this
.
_client
)
const
[
elecAccount
,
waterAccount
,
gasAccount
]:
(
Account
|
null
)[]
=
const
[
elecAccount
,
waterAccount
,
gasAccount
]
=
await
Promise
.
all
([
await
Promise
.
all
([
accountService
.
getAccountByType
(
accountService
.
getAccountByType
(
fluidConfig
[
FluidType
.
ELECTRICITY
].
konnectorConfig
.
slug
fluidConfig
[
FluidType
.
ELECTRICITY
].
konnectorConfig
.
slug
),
),
accountService
.
getAccountByType
(
accountService
.
getAccountByType
(
fluidConfig
[
FluidType
.
WATER
].
konnectorConfig
.
slug
fluidConfig
[
FluidType
.
WATER
].
konnectorConfig
.
slug
),
),
accountService
.
getAccountByType
(
accountService
.
getAccountByType
(
fluidConfig
[
FluidType
.
GAS
].
konnectorConfig
.
slug
fluidConfig
[
FluidType
.
GAS
].
konnectorConfig
.
slug
),
),
])
])
const
konnectorService
=
new
KonnectorService
(
this
.
_client
)
const
konnectorService
=
new
KonnectorService
(
this
.
_client
)
const
[
elecKonnector
,
waterKonnector
,
gasKonnector
]:
(
Konnector
|
null
)[]
=
const
[
elecKonnector
,
waterKonnector
,
gasKonnector
]
=
await
Promise
.
all
([
await
Promise
.
all
([
konnectorService
.
getKonnector
(
konnectorService
.
getKonnector
(
fluidConfig
[
FluidType
.
ELECTRICITY
].
konnectorConfig
.
slug
fluidConfig
[
FluidType
.
ELECTRICITY
].
konnectorConfig
.
slug
),
),
konnectorService
.
getKonnector
(
konnectorService
.
getKonnector
(
fluidConfig
[
FluidType
.
WATER
].
konnectorConfig
.
slug
fluidConfig
[
FluidType
.
WATER
].
konnectorConfig
.
slug
),
),
konnectorService
.
getKonnector
(
konnectorService
.
getKonnector
(
fluidConfig
[
FluidType
.
GAS
].
konnectorConfig
.
slug
fluidConfig
[
FluidType
.
GAS
].
konnectorConfig
.
slug
),
),
])
])
const
triggerService
=
new
TriggerService
(
this
.
_client
)
const
triggerService
=
new
TriggerService
(
this
.
_client
)
const
[
elecTrigger
,
waterTrigger
,
gasTrigger
]:
(
Trigger
|
null
)[]
=
const
[
elecTrigger
,
waterTrigger
,
gasTrigger
]
=
await
Promise
.
all
([
await
Promise
.
all
([
elecAccount
&&
elecKonnector
elecAccount
&&
elecKonnector
?
triggerService
.
getTrigger
(
elecAccount
,
elecKonnector
)
?
triggerService
.
getTrigger
(
elecAccount
,
elecKonnector
)
:
null
,
:
null
,
waterAccount
&&
waterKonnector
waterAccount
&&
waterKonnector
?
triggerService
.
getTrigger
(
waterAccount
,
waterKonnector
)
?
triggerService
.
getTrigger
(
waterAccount
,
waterKonnector
)
:
null
,
:
null
,
gasAccount
&&
gasKonnector
gasAccount
&&
gasKonnector
?
triggerService
.
getTrigger
(
gasAccount
,
gasKonnector
)
?
triggerService
.
getTrigger
(
gasAccount
,
gasKonnector
)
:
null
,
:
null
,
])
])
const
consumptionService
=
new
ConsumptionService
(
this
.
_client
)
const
consumptionService
=
new
ConsumptionService
(
this
.
_client
)
const
[
elecStatus
,
waterStatus
,
gasStatus
]:
(
TriggerState
|
null
)[]
=
const
[
elecStatus
,
waterStatus
,
gasStatus
]
=
await
Promise
.
all
([
await
Promise
.
all
([
elecTrigger
?
triggerService
.
fetchTriggerState
(
elecTrigger
)
:
null
,
elecTrigger
?
triggerService
.
fetchTriggerState
(
elecTrigger
)
:
null
,
waterTrigger
?
triggerService
.
fetchTriggerState
(
waterTrigger
)
:
null
,
waterTrigger
?
triggerService
.
fetchTriggerState
(
waterTrigger
)
:
null
,
gasTrigger
?
triggerService
.
fetchTriggerState
(
gasTrigger
)
:
null
,
gasTrigger
?
triggerService
.
fetchTriggerState
(
gasTrigger
)
:
null
,
])
])
console
.
log
(
'
🚀 ~ FluidService ~ gasStatus:
'
,
gasStatus
)
console
.
log
(
'
🚀 ~ FluidService ~ gasStatus:
'
,
gasStatus
)
const
firstDataDates
=
const
firstDataDates
=
await
consumptionService
.
fetchAllFirstDateData
(
allFluids
)
await
consumptionService
.
fetchAllFirstDateData
(
allFluids
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment