@things-factory/dataset 6.0.64 → 6.0.66

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/dataset",
3
- "version": "6.0.64",
3
+ "version": "6.0.66",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "dist-client/index.js",
6
6
  "things-factory": true,
@@ -47,5 +47,5 @@
47
47
  "cron-parser": "^4.3.0",
48
48
  "moment-timezone": "^0.5.40"
49
49
  },
50
- "gitHead": "0fc17b9d97e347aea917f7b8f6c0518285ac30c8"
50
+ "gitHead": "be8f5c22cde7454f21d5bfabc0eb092ef59c0701"
51
51
  }
@@ -92,7 +92,18 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
92
92
  const dataKeys = fillDataKeys(dataSet?.dataKeySet, dataSample.data)
93
93
 
94
94
  const { ooc, oos, judgment } = DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {}
95
+
96
+ const old = await tx.getRepository(DataSample).findOne({
97
+ where: {
98
+ domain: { id: domain.id },
99
+ dataSet: { id: dataSet.id },
100
+ collectedAt,
101
+ ...dataKeys
102
+ }
103
+ })
104
+
95
105
  const result = await tx.getRepository(DataSample).save({
106
+ ...old,
96
107
  name: dataSet.name,
97
108
  description: dataSet.description,
98
109
  useCase: dataSet.useCase,
@@ -31,6 +31,11 @@ const DATABASE_TYPE = ORMCONFIG.type
31
31
  ],
32
32
  { unique: false }
33
33
  )
34
+ @Index(
35
+ 'ix_data_sample_1',
36
+ (dataSample: DataSample) => [dataSample.domain, dataSample.dataSet, dataSample.collectedAt],
37
+ { unique: false }
38
+ )
34
39
  @ObjectType({ description: 'Entity for DataSample' })
35
40
  export class DataSample {
36
41
  @PrimaryGeneratedColumn('uuid')
@@ -79,7 +79,7 @@ export class DataSensorPatch {
79
79
  refBy?: String
80
80
 
81
81
  @Field(type => ObjectRef, { nullable: true })
82
- appliance: ObjectRef
82
+ appliance?: ObjectRef
83
83
 
84
84
  @Field(type => ObjectRef, { nullable: true })
85
85
  dataSet?: ObjectRef
@@ -20,6 +20,7 @@
20
20
  "field.entry-type": "entry type",
21
21
  "field.entry-view": "entry view",
22
22
  "field.hidden": "hidden",
23
+ "field.item": "item",
23
24
  "field.key-01": "key 1",
24
25
  "field.key-02": "key 2",
25
26
  "field.key-03": "key 3",
@@ -20,6 +20,7 @@
20
20
  "field.entry-type": "입력용 화면종류",
21
21
  "field.entry-view": "입력용 화면",
22
22
  "field.hidden": "숨기기",
23
+ "field.item": "항목",
23
24
  "field.key-01": "데이타키 1",
24
25
  "field.key-02": "데이타키 2",
25
26
  "field.key-03": "데이타키 3",
@@ -19,6 +19,7 @@
19
19
  "field.entry-type": "entry type",
20
20
  "field.entry-view": "entry view",
21
21
  "field.hidden": "hidden",
22
+ "field.item": "item",
22
23
  "field.key-01": "key 1",
23
24
  "field.key-02": "key 2",
24
25
  "field.key-03": "key 3",
@@ -19,6 +19,7 @@
19
19
  "field.entry-type": "entry type",
20
20
  "field.entry-view": "entry view",
21
21
  "field.hidden": "hidden",
22
+ "field.item": "项目",
22
23
  "field.key-01": "key 1",
23
24
  "field.key-02": "key 2",
24
25
  "field.key-03": "key 3",