Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
keeleliin-wrapper
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
keeleliin
keeleliin-wrapper
Commits
c998179b
Commit
c998179b
authored
Nov 19, 2015
by
priit
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ressursi piirang
parent
9f4ad001
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
59 additions
and
20 deletions
+59
-20
controllers/api/v1/service.js
controllers/api/v1/service.js
+14
-13
src/model/serviceRequest.js
src/model/serviceRequest.js
+44
-7
src/service/daoService.js
src/service/daoService.js
+1
-0
No files found.
controllers/api/v1/service.js
View file @
c998179b
...
...
@@ -15,21 +15,22 @@ router.post('/', function ( req, res ) {
var
serviceRequest
=
new
ServiceRequest
(
req
.
body
,
req
.
files
);
if
(
!
serviceRequest
.
isValid
()){
logger
.
debug
(
'
Invalid request
'
);
res
.
send
(
serviceRequest
.
getMessages
());
return
;
}
serviceRequest
.
isValid
(
function
(
err
,
isValid
)
{
logger
.
debug
(
serviceRequest
);
wrapperService
.
execute
(
serviceRequest
,
function
(
err
,
data
)
{
if
(
err
){
logger
.
debug
(
'
Got error
'
,
err
);
return
res
.
send
({
errors
:
err
});
if
(
err
||
!
isValid
){
logger
.
debug
(
'
Invalid request
'
);
res
.
send
(
serviceRequest
.
getMessages
());
return
;
}
logger
.
debug
(
'
Send response
'
);
res
.
send
(
data
);
wrapperService
.
execute
(
serviceRequest
,
function
(
err
,
data
)
{
if
(
err
){
logger
.
debug
(
'
Got error
'
,
err
);
return
res
.
send
({
errors
:
err
});
}
logger
.
debug
(
'
Send response
'
);
return
res
.
send
(
data
);
});
});
});
...
...
src/model/serviceRequest.js
View file @
c998179b
var
logger
=
require
(
'
log4js
'
).
getLogger
(
'
service_request
'
);
var
config
=
require
(
'
../../config
'
);
var
fs
=
require
(
'
fs
'
);
var
async
=
require
(
'
async
'
);
function
ServiceRequest
(
requestBody
,
requestFiles
)
{
var
self
=
this
;
...
...
@@ -8,10 +10,11 @@ function ServiceRequest( requestBody, requestFiles ) {
this
.
files
=
requestFiles
;
var
messages
=
null
;
this
.
isValid
=
function
(){
this
.
isValid
=
function
(
cb
){
self
.
_mapParams
();
self
.
_checkFiles
();
return
messages
==
null
;
self
.
_checkFiles
(
function
(
err
)
{
cb
(
err
,
messages
==
null
);
});
};
this
.
setMessage
=
function
(
key
,
value
)
{
...
...
@@ -55,14 +58,48 @@ function ServiceRequest( requestBody, requestFiles ) {
}
};
this
.
_checkFiles
=
function
()
{
this
.
_checkFiles
=
function
(
cb
)
{
for
(
var
fileId
in
config
.
wrapper
.
requestConf
.
requestFiles
){
if
(
!
self
.
files
[
fileId
]){
async
.
forEachOf
(
config
.
wrapper
.
requestConf
.
requestFiles
,
function
(
requestFile
,
fileId
,
innerCb
)
{
logger
.
debug
(
requestFile
);
logger
.
debug
(
fileId
);
var
fileItem
=
self
.
files
[
fileId
];
if
(
!
fileItem
){
logger
.
error
(
'
Nõutud faili ei saadetud
'
+
fileId
,
self
.
files
);
self
.
setMessage
(
fileId
,
'
Nõutud faili ei saadetud
'
);
return
innerCb
();
}
}
if
(
requestFile
.
isList
==
false
&&
Array
.
isArray
(
fileItem
)){
self
.
setMessage
(
fileId
,
'
Lubatud on ainult 1 fail
'
);
return
innerCb
();
}
if
(
requestFile
.
sizeLimit
>
0
){
var
limitLeft
=
requestFile
.
sizeLimit
;
if
(
Array
.
isArray
(
fileItem
)
){
for
(
i
in
fileItem
){
var
fileItemItem
=
fileItem
[
i
];
var
stat
=
fs
.
statSync
(
fileItemItem
.
path
);
limitLeft
=
limitLeft
-
stat
.
size
;
}
}
else
{
var
stat
=
fs
.
statSync
(
fileItem
.
path
);
limitLeft
=
limitLeft
-
stat
.
size
;
}
if
(
limitLeft
<
0
){
self
.
setMessage
(
fileId
,
'
Saadetud failide mahu piirang ületati
'
);
}
}
return
innerCb
();
},
cb
);
};
this
.
getMessages
=
function
(){
...
...
src/service/daoService.js
View file @
c998179b
...
...
@@ -21,6 +21,7 @@ var DaoService = function(){
this
.
client
.
set
(
prefix
+
key
,
JSON
.
stringify
(
value
),
function
(
err
,
reply
)
{
if
(
cb
!=
undefined
){
self
.
client
.
expire
(
prefix
+
key
,
config
.
wrapper
.
sessionMaxLifetime
);
cb
(
err
,
reply
);
}
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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