Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
ensalamento-back
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ensalamento
ensalamento-back
Commits
9e107964
Commit
9e107964
authored
Oct 17, 2018
by
Matheus Horstmann
🐴
Committed by
Bruno Meyer
Oct 17, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Preparar para conexão com Postgres"
parent
87b9bd51
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
37 additions
and
32 deletions
+37
-32
.env
.env
+3
-0
bin/automigrate.js
bin/automigrate.js
+3
-3
bin/discover-and-build-models.js
bin/discover-and-build-models.js
+17
-14
common/models/disciplina.js
common/models/disciplina.js
+11
-12
common/models/equivalencia-disciplina.json
common/models/equivalencia-disciplina.json
+2
-2
server/model-config.json
server/model-config.json
+1
-1
No files found.
.env
0 → 100644
View file @
9e107964
ENSALAMENTO_DB_USER=ensalamento
ENSALAMENTO_DB_PASSWORD=123mudar
ENSALAMENTO_NODE_ENV=development
bin/automigrate.js
View file @
9e107964
...
...
@@ -6,7 +6,7 @@ var app = require(path.resolve(__dirname, '../server/server'));
var
ds
=
app
.
datasources
.
ensalamento
;
var
lbTables
=
[
'
User
'
,
'
AccessToken
'
,
'
ACL
'
,
'
RoleMapping
'
,
'
Role
'
,
'
Sala
'
,
'
Bloco
'
,
'
Disciplina
'
,
'
Equivalencia
D
isciplina
'
];
var
lbTables
=
[
'
User
'
,
'
AccessToken
'
,
'
ACL
'
,
'
RoleMapping
'
,
'
Role
'
,
'
Sala
'
,
'
Bloco
'
,
'
Disciplina
'
,
'
Equivalencia
d
isciplina
'
];
ds
.
automigrate
(
lbTables
,
function
(
err
)
{
if
(
err
)
throw
err
;
...
...
@@ -83,9 +83,9 @@ function criaEquivalencia(cb){
app
.
models
.
Disciplina
.
find
({
id
:
1
},
function
(
err
,
disc
){
disc
[
0
].
addEquivalencia
(
2
,
function
(
err
,
data
){
if
(
err
)
throw
err
;
console
.
log
(
'
Created Equivalencia
D
isciplina:
'
,
disc
);
console
.
log
(
'
Created Equivalencia
d
isciplina:
'
,
disc
);
});
});
}
...
...
bin/discover-and-build-models.js
View file @
9e107964
var
path
=
require
(
'
path
'
);
var
async
=
require
(
'
async
'
);
var
app
=
require
(
path
.
resolve
(
__dirname
,
'
../server/server
'
));
var
ds
=
app
.
datasources
.
ensalamento
;
var
functions
=
[
discoverAndBuildUser
,
discoverAndBuildRole
,
discoverAndBuildSala
,
discoverAndBuildSala
,
discoverAndBuildBloco
,
discoverAndBuildDisciplina
,
discoverAndBuildEquivalenciadisciplina
,
discoverAndBuildAccessToken
,
discoverAndBuildACL
,
discoverAndBuildRoleMapping
]
async
.
parallel
(
functions
,
function
(
error
){
if
(
err
)
throw
err
;
ds
.
disconnect
();
});
function
discoverAndBuildUser
(){
...
...
@@ -27,11 +34,9 @@ function discoverAndBuildAccessToken(){
ds
.
discoverAndBuildModels
(
'
accesstoken
'
,
{
schema
:
'
public
'
},
function
(
err
,
models
)
{
if
(
err
)
throw
err
;
models
.
AccessToken
.
find
(
function
(
err
,
accesstokens
)
{
models
.
Accesstoken
.
find
(
function
(
err
,
accesstokens
)
{
if
(
err
)
return
console
.
log
(
err
);
console
.
log
(
accesstoken
);
console
.
log
(
accesstokens
);
});
...
...
@@ -44,8 +49,7 @@ function discoverAndBuildACL(){
ds
.
discoverAndBuildModels
(
'
acl
'
,
{
schema
:
'
public
'
},
function
(
err
,
models
)
{
if
(
err
)
throw
err
;
models
.
ACL
.
find
(
function
(
err
,
acls
)
{
models
.
Acl
.
find
(
function
(
err
,
acls
)
{
if
(
err
)
return
console
.
log
(
err
);
console
.
log
(
acls
);
...
...
@@ -63,10 +67,10 @@ function discoverAndBuildRoleMapping(){
ds
.
discoverAndBuildModels
(
'
rolemapping
'
,
{
schema
:
'
public
'
},
function
(
err
,
models
)
{
if
(
err
)
throw
err
;
models
.
Role
Mapping
.
find
(
function
(
err
,
rolesmapping
)
{
models
.
Role
mapping
.
find
(
function
(
err
,
rolesmappings
)
{
if
(
err
)
return
console
.
log
(
err
);
console
.
log
(
rolesmapping
);
console
.
log
(
rolesmapping
s
);
});
...
...
@@ -135,7 +139,7 @@ function discoverAndBuildDisciplina(){
models
.
Disciplina
.
find
(
function
(
err
,
disciplinas
)
{
if
(
err
)
return
console
.
log
(
err
);
console
.
log
(
disciplina
);
console
.
log
(
disciplina
s
);
});
...
...
@@ -145,12 +149,11 @@ function discoverAndBuildDisciplina(){
function
discoverAndBuildEquivalencia
D
isciplina
(){
function
discoverAndBuildEquivalencia
d
isciplina
(){
ds
.
discoverAndBuildModels
(
'
equivalenciadisciplina
'
,
{
schema
:
'
public
'
},
function
(
err
,
models
)
{
if
(
err
)
throw
err
;
models
.
EquivalenciaDisciplina
.
find
(
function
(
err
,
equivalenciadisciplinas
)
{
models
.
Equivalenciadisciplina
.
find
(
function
(
err
,
equivalenciadisciplinas
)
{
if
(
err
)
return
console
.
log
(
err
);
console
.
log
(
equivalenciadisciplinas
);
...
...
common/models/disciplina.js
View file @
9e107964
...
...
@@ -3,29 +3,28 @@
var
app
=
require
(
'
../../server/server
'
);
module
.
exports
=
function
(
Disciplina
)
{
// The follow remote methods was constructed because there is many problems
// in the Model Self Relation in LoopBack API 3
// The model EquivalenciaDisciplina was created to implement this relation
Disciplina
.
prototype
.
addEquivalencia
=
function
(
disciplina_eq_id
,
cb
)
{
var
Eq
=
app
.
models
.
Equivalencia
D
isciplina
;
var
Eq
=
app
.
models
.
Equivalencia
d
isciplina
;
Eq
.
create
({
"
disciplina1
"
:
this
.
id
,
"
disciplina2
"
:
disciplina_eq_id
},
function
(
err
,
eq
){
cb
(
err
,
eq
);
});
};
Disciplina
.
prototype
.
getEquivalencias
=
function
(
cb
)
{
var
Eq
=
app
.
models
.
Equivalencia
D
isciplina
;
var
Eq
=
app
.
models
.
Equivalencia
d
isciplina
;
let
myId
=
this
.
id
;
Eq
.
find
({
where
:{
or
:[
{
disciplina1
:
myId
},
{
disciplina2
:
myId
}
]}},
function
(
err
,
eq
){
// Filter only the ids of equivalents courses
// The id can be on disciplina1 or disciplina2 columns
// console.log(eq[0].disciplina1.toString(), eq[0].disciplina2.toString());
var
ret
=
eq
.
map
(
function
(
x
){
x
=
x
.
toJSON
();
if
(
myId
==
x
.
disciplina1
)
return
x
.
disciplina2
;
...
...
@@ -39,13 +38,13 @@ module.exports = function(Disciplina) {
cb
(
err
,
uniqueArray
);
});
};
Disciplina
.
prototype
.
deleteEquivalencia
=
function
(
disciplina_eq_id
,
cb
)
{
var
Eq
=
app
.
models
.
Equivalencia
D
isciplina
;
var
Eq
=
app
.
models
.
Equivalencia
d
isciplina
;
let
myId
=
this
.
id
;
// Find and destroy all relations between the two specified instances
// The relation can be in form of (id1,id2) or (id2,id1)
Eq
.
destroyAll
({
...
...
@@ -66,7 +65,7 @@ module.exports = function(Disciplina) {
},
function
(
err
,
info
){
cb
(
err
,
info
);
});
};
};
common/models/equivalencia-disciplina.json
View file @
9e107964
{
"name"
:
"Equivalencia
D
isciplina"
,
"plural"
:
"equivalencias
D
isciplinas"
,
"name"
:
"Equivalencia
d
isciplina"
,
"plural"
:
"equivalencias
d
isciplinas"
,
"base"
:
"PersistedModel"
,
"idInjection"
:
true
,
"options"
:
{
...
...
server/model-config.json
View file @
9e107964
...
...
@@ -47,7 +47,7 @@
"dataSource"
:
"ensalamento"
,
"public"
:
true
},
"Equivalencia
D
isciplina"
:
{
"Equivalencia
d
isciplina"
:
{
"dataSource"
:
"ensalamento"
,
"public"
:
false
}
...
...
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