Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
MKCLOS
Core Development Platform
corepkgv2
Commits
8c06d93f
Commit
8c06d93f
authored
6 years ago
by
Ajit Jagtap
Browse files
Options
Downloads
Plain Diff
Merge branch 'devbranch' into 'master'
Devbranch to Master See merge request
!37
parents
541913f5
0e7714a3
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!76
Add: Message Id header to avoid spam mails
,
!37
Devbranch to Master
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dalmdl/mongodb/mongodb.go
+4
-1
dalmdl/mongodb/mongodb.go
routebuildermdl/masterServicemdl.go
+3
-2
routebuildermdl/masterServicemdl.go
servicebuildermdl/servicebuildermdl.go
+1
-1
servicebuildermdl/servicebuildermdl.go
with
8 additions
and
4 deletions
dalmdl/mongodb/mongodb.go
+
4
−
1
View file @
8c06d93f
...
...
@@ -175,7 +175,10 @@ func (mg *MongoDAO) GetData(selector map[string]interface{}) (*gjson.Result, err
collection
:=
session
.
DB
(
db
.
Database
)
.
C
(
mg
.
collectionName
)
var
result
[]
interface
{}
collection
.
Find
(
selector
)
.
All
(
&
result
)
ba
,
_
:=
json
.
Marshal
(
result
)
ba
,
marshalError
:=
json
.
Marshal
(
result
)
if
errormdl
.
CheckErr2
(
marshalError
)
!=
nil
{
return
nil
,
errormdl
.
CheckErr2
(
marshalError
)
}
rs
:=
gjson
.
ParseBytes
(
ba
)
return
&
rs
,
nil
}
...
...
This diff is collapsed.
Click to expand it.
routebuildermdl/masterServicemdl.go
+
3
−
2
View file @
8c06d93f
...
...
@@ -130,14 +130,15 @@ func (m *Runable) Run(data []byte) (interface{}, error) {
func
(
m
*
Runable
)
runMongoService
(
data
[]
byte
)
(
interface
{},
error
)
{
rs
:=
gjson
.
ParseBytes
(
data
)
tmp
:=
m
.
MongoQuery
.
Query
for
i
,
arg
:=
range
m
.
MongoQuery
.
Args
{
result
:=
rs
.
Get
(
arg
)
.
String
()
argNotation
:=
"~"
+
strconv
.
Itoa
(
i
+
1
)
m
.
MongoQuery
.
Query
=
strings
.
Replace
(
m
.
MongoQuery
.
Query
,
argNotation
,
result
,
1
)
tmp
=
strings
.
Replace
(
tmp
,
argNotation
,
result
,
1
)
}
var
v
map
[
string
]
interface
{}
unmarshalError
:=
json
.
Unmarshal
([]
byte
(
m
.
MongoQuery
.
Query
),
&
v
)
unmarshalError
:=
json
.
Unmarshal
([]
byte
(
tmp
),
&
v
)
if
errormdl
.
CheckErr
(
unmarshalError
)
!=
nil
{
loggermdl
.
LogError
(
unmarshalError
)
return
nil
,
errormdl
.
CheckErr
(
unmarshalError
)
...
...
This diff is collapsed.
Click to expand it.
servicebuildermdl/servicebuildermdl.go
+
1
−
1
View file @
8c06d93f
...
...
@@ -306,7 +306,7 @@ func (sb *ServiceBuilder) executeErrorFunction(fn func() (map[string]interface{}
loggermdl
.
LogError
(
err
)
return
nil
,
errormdl
.
CheckErr
(
err
)
}
return
nil
,
nil
return
sb
.
businessLogicHolder
.
GetFinalData
()
,
nil
}
// finalOutput return Final output
...
...
This diff is collapsed.
Click to expand it.
Preview
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!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets