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
b72a12e0
Commit
b72a12e0
authored
4 years ago
by
Yoan VALLET
Browse files
Options
Downloads
Patches
Plain Diff
feat: review of type for usageEvent creation
parent
2703567f
No related branches found
No related tags found
1 merge request
!348
Features/create aggregation usage service
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/models/usageEvent.model.ts
+5
-2
5 additions, 2 deletions
src/models/usageEvent.model.ts
src/services/usageEvent.service.ts
+17
-17
17 additions, 17 deletions
src/services/usageEvent.service.ts
with
22 additions
and
19 deletions
src/models/usageEvent.model.ts
+
5
−
2
View file @
b72a12e0
import
{
UsageEventType
}
from
'
enum/usageEvent.enum
'
import
{
UsageEventType
}
from
'
enum/usageEvent.enum
'
import
{
DateTime
}
from
'
luxon
'
import
{
DateTime
}
from
'
luxon
'
export
interface
UsageEventEntity
{
export
interface
UsageEventCreationEntity
{
_id
:
string
date
:
string
date
:
string
type
:
UsageEventType
type
:
UsageEventType
target
?:
string
target
?:
string
...
@@ -11,6 +10,10 @@ export interface UsageEventEntity {
...
@@ -11,6 +10,10 @@ export interface UsageEventEntity {
aggregated
:
boolean
aggregated
:
boolean
}
}
export
interface
UsageEventEntity
extends
UsageEventCreationEntity
{
_id
:
string
}
export
interface
UsageEvent
extends
Omit
<
UsageEventEntity
,
'
date
'
>
{
export
interface
UsageEvent
extends
Omit
<
UsageEventEntity
,
'
date
'
>
{
date
:
DateTime
date
:
DateTime
}
}
This diff is collapsed.
Click to expand it.
src/services/usageEvent.service.ts
+
17
−
17
View file @
b72a12e0
import
{
Client
,
QueryDefinition
,
QueryResult
,
Q
}
from
'
cozy-client
'
import
{
Client
,
QueryDefinition
,
QueryResult
,
Q
,
MongoSelector
,
}
from
'
cozy-client
'
import
{
USAGEEVENT_DOCTYPE
}
from
'
doctypes
'
import
{
USAGEEVENT_DOCTYPE
}
from
'
doctypes
'
import
{
UsageEventType
}
from
'
enum/usageEvent.enum
'
import
{
UsageEventType
}
from
'
enum/usageEvent.enum
'
import
{
DateTime
}
from
'
luxon
'
import
{
DateTime
}
from
'
luxon
'
import
{
UsageEvent
,
UsageEventEntity
}
from
'
models
'
import
{
UsageEvent
,
UsageEventCreationEntity
,
UsageEventEntity
}
from
'
models
'
interface
AddEventParams
{
interface
AddEventParams
{
type
:
UsageEventType
type
:
UsageEventType
...
@@ -11,14 +17,6 @@ interface AddEventParams {
...
@@ -11,14 +17,6 @@ interface AddEventParams {
context
?:
string
context
?:
string
}
}
interface
GetEventParams
{
type
?:
UsageEventType
target
?:
string
result
?:
string
context
?:
string
aggregated
?:
boolean
}
export
default
class
UsageEventService
{
export
default
class
UsageEventService
{
/**
/**
* addEvent
* addEvent
...
@@ -30,12 +28,14 @@ export default class UsageEventService {
...
@@ -30,12 +28,14 @@ export default class UsageEventService {
client
:
Client
,
client
:
Client
,
params
:
AddEventParams
params
:
AddEventParams
):
Promise
<
UsageEvent
>
{
):
Promise
<
UsageEvent
>
{
const
usageEvent
:
UsageEvent
=
{
const
usageEvent
:
UsageEventCreationEntity
=
{
date
:
DateTime
.
local
().
setZone
(
'
utc
'
,
{
keepLocalTime
:
true
,
}),
aggregated
:
false
,
...
params
,
...
params
,
date
:
DateTime
.
local
()
.
setZone
(
'
utc
'
,
{
keepLocalTime
:
true
,
})
.
toString
(),
aggregated
:
false
,
}
}
const
{
data
}:
QueryResult
<
UsageEventEntity
>
=
await
client
.
create
(
const
{
data
}:
QueryResult
<
UsageEventEntity
>
=
await
client
.
create
(
USAGEEVENT_DOCTYPE
,
USAGEEVENT_DOCTYPE
,
...
@@ -47,12 +47,12 @@ export default class UsageEventService {
...
@@ -47,12 +47,12 @@ export default class UsageEventService {
/**
/**
* getEvents
* getEvents
* @param {Client} client
* @param {Client} client
* @param {
GetEventParams
} filterParams
* @param {
MongoSelector
} filterParams
* @returns {Promise<UsageEvent[]>} usageEvent added
* @returns {Promise<UsageEvent[]>} usageEvent added
*/
*/
static
async
getEvents
(
static
async
getEvents
(
client
:
Client
,
client
:
Client
,
filterParams
:
GetEventParams
filterParams
:
MongoSelector
):
Promise
<
UsageEvent
[]
>
{
):
Promise
<
UsageEvent
[]
>
{
const
query
:
QueryDefinition
=
Q
(
USAGEEVENT_DOCTYPE
)
const
query
:
QueryDefinition
=
Q
(
USAGEEVENT_DOCTYPE
)
.
where
(
filterParams
)
.
where
(
filterParams
)
...
...
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