Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Open Subsurface Data Universe Software
Platform
Domain Data Management Services
Seismic
Seismic DMS Suite
seismic-dms-service
Commits
3d6b11f9
Commit
3d6b11f9
authored
Jul 07, 2021
by
Walter D
Committed by
Anuj Gupta
Jul 07, 2021
Browse files
fix: IBM open issues ctag final
parent
cc64b65b
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/cloud/providers/ibm/datastore.ts
View file @
3d6b11f9
...
...
@@ -18,14 +18,13 @@ export class DatastoreDAO extends AbstractJournal {
public
constructor
(
tenant
:
TenantModel
)
{
super
();
logger
.
info
(
'
In datastore.constructor.
'
);
this
.
dataPartition
=
tenant
.
esd
.
indexOf
(
'
.
'
)
!==
-
1
?
tenant
.
esd
.
split
(
'
.
'
)[
0
]
:
tenant
.
es
d
;
this
.
dataPartition
=
tenant
.
gcpi
d
;
}
public
async
initDb
(
dataPartition
:
string
)
{
logger
.
info
(
'
In datastore.initDb.
'
);
const
dbUrl
=
IbmConfig
.
DOC_DB_URL
;
logger
.
debug
(
dbUrl
);
const
cloudantOb
=
cloudant
(
dbUrl
);
logger
.
info
(
'
DB initialized. cloudantOb-
'
);
...
...
@@ -84,23 +83,22 @@ export class DatastoreDAO extends AbstractJournal {
await
this
.
initDb
(
this
.
dataPartition
);
logger
.
info
(
'
Fetching document.
'
);
/// changed from entity.name to entity.key.name
await
this
.
docDb
.
get
(
entity
.
key
.
name
,
{
revs_info
:
true
},
(
err
,
existingDoc
)
=>
{
if
(
!
err
)
{
/// update record
logger
.
info
(
'
Document exists in db.
'
);
const
docTemp
=
JSON
.
parse
(
JSON
.
stringify
(
existingDoc
));
/// have to add if condition. before that check the dataset object structure
docTemp
.
ltag
=
entity
.
ltag
;
if
(
entity
.
data
.
trusted
)
docTemp
.
trusted
=
entity
.
data
.
trusted
;
Object
.
assign
(
docTemp
,
entity
.
data
);
logger
.
debug
(
docTemp
);
this
.
docDb
.
insert
(
docTemp
,
entity
.
key
.
name
);
logger
.
info
(
'
Document updated.
'
);
}
else
/// insert record
try
{
const
getResponse
=
await
this
.
docDb
.
get
(
entity
.
key
.
name
,
{
revs_info
:
true
});
logger
.
info
(
'
Document exists in db.
'
);
const
existingDoc
=
getResponse
;
const
docTemp
=
JSON
.
parse
(
JSON
.
stringify
(
existingDoc
));
/// have to add if condition. before that check the dataset object structure
docTemp
.
ltag
=
entity
.
ltag
;
if
(
entity
.
data
.
trusted
)
docTemp
.
trusted
=
entity
.
data
.
trusted
;
Object
.
assign
(
docTemp
,
entity
.
data
);
logger
.
debug
(
docTemp
);
await
this
.
docDb
.
insert
(
docTemp
,
entity
.
key
.
name
);
logger
.
info
(
'
Document updated.
'
);
}
catch
(
err
){
if
(
err
.
statusCode
===
404
)
{
logger
.
info
(
'
Document does not exist. This will be a new document
'
);
const
customizedOb
=
{};
...
...
@@ -110,13 +108,13 @@ export class DatastoreDAO extends AbstractJournal {
for
(
const
element
in
entity
.
data
)
{
if
(
!
((
entity
.
key
.
kind
===
'
datasets
'
||
entity
.
key
.
kind
===
'
seismicmeta
'
)
&&
element
===
'
_id
'
))
if
(
!
((
entity
.
key
.
kind
===
'
datasets
'
||
entity
.
key
.
kind
===
'
seismicmeta
'
)
&&
element
===
'
_rev
'
))
customizedOb
[
element
]
=
entity
.
data
[
element
];
customizedOb
[
element
]
=
entity
.
data
[
element
];
};
logger
.
debug
(
customizedOb
);
this
.
docDb
.
insert
(
customizedOb
,
entity
.
key
.
name
);
await
this
.
docDb
.
insert
(
customizedOb
,
entity
.
key
.
name
);
logger
.
info
(
'
Document inserted.
'
);
}
}
);
}
logger
.
info
(
'
Returning from datastore.save.
'
);
}
...
...
@@ -582,4 +580,4 @@ class QueryStatementBuilder {
logger
.
debug
(
selectorQuery
);
return
selectorQuery
;
}
}
\ No newline at end of file
}
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment