Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Activity#2 #32

Merged
merged 219 commits into from
May 16, 2016
Merged
Changes from 1 commit
Commits
Show all changes
219 commits
Select commit Hold shift + click to select a range
2b3c464
Add Config and MongoConnection modules
mdipirro May 3, 2016
b9ad359
Rename files
mdipirro May 3, 2016
c09b772
Add typedoc
mdipirro May 3, 2016
c451be2
Add skeleton
Polpetta May 3, 2016
32d0d62
Correct structure
mdipirro May 3, 2016
c73aa8b
Merge branch 'activity#2' into issue#10
Polpetta May 3, 2016
80786f8
Add initial stuff
Polpetta May 3, 2016
5277b87
Add empty test
Polpetta May 3, 2016
58d5015
Merge branch 'activity#2' into issue#10
Polpetta May 3, 2016
fd9235e
Add personal memo
Polpetta May 3, 2016
3b27d66
Fix for lint rules
Polpetta May 3, 2016
e5dbbcd
Set expressRef to private
Polpetta May 3, 2016
122f528
Add configuration classes
mdipirro May 3, 2016
c640330
Add chooser class
mdipirro May 3, 2016
d7dc7fb
Add tests
mdipirro May 3, 2016
72c1cbc
Merge branch 'activity#2' into issue#10
Polpetta May 4, 2016
d58c003
Merge branch 'activity#2' into issue#10
Polpetta May 4, 2016
4d15d13
Add a space in the comments
Polpetta May 4, 2016
3dd0c86
Correct import paths
mdipirro May 4, 2016
83e5d46
Update structure removing app directory
mdipirro May 4, 2016
ed99831
Merge branch 'activity#2' of github.com:BugBusterSWE/MaaS into activi…
mdipirro May 4, 2016
8a4cfe6
Add empty line
Polpetta May 4, 2016
d28557d
Fix Jenkinsfile
Polpetta May 4, 2016
5c65d7e
Mini fix
Polpetta May 4, 2016
c0b5ba3
An example
Polpetta May 4, 2016
a2dfd70
Only list test/
Polpetta May 4, 2016
e4fe126
Remove debug
Polpetta May 4, 2016
976e633
Add promise
Polpetta May 4, 2016
c4d6f74
Add es6 typings
Polpetta May 4, 2016
59c0243
Write documentation
Polpetta May 4, 2016
4ebc826
Write documentation
Polpetta May 4, 2016
5000655
Add MongooseConnection and Model classes
mdipirro May 4, 2016
52fec29
Add tests
mdipirro May 4, 2016
38711fa
Add MaaS init file
mdipirro May 4, 2016
656fbbd
Make class template
drigoni May 5, 2016
372f118
Make template of class
drigoni May 5, 2016
92f0a47
Move tests
mdipirro May 5, 2016
6f8f012
Remove comments
mdipirro May 5, 2016
c684702
Add some middlewares
mdipirro May 5, 2016
dec1529
Add mongoose
mdipirro May 6, 2016
77d9bea
Create a first draft for databaseRouter
Polpetta May 6, 2016
27dface
Create the createGetRouter method
drigoni May 6, 2016
0e7b470
Change "noImplicitAny" to false
drigoni May 6, 2016
67b4015
Fix compilation errors on databaseRouters
Polpetta May 6, 2016
4894fa7
Set noImplicitAny to false
Polpetta May 6, 2016
08e3a26
Add mongoose dep
Polpetta May 6, 2016
9a013e1
Add skeleton for databaseModel
Polpetta May 6, 2016
606da71
Add router facade
mdipirro May 6, 2016
d90f156
Add personal notes
Polpetta May 6, 2016
9169aa0
Add mongoose
mdipirro May 6, 2016
17e3925
Fix typo
Polpetta May 6, 2016
8047e40
TSLint compliant
Polpetta May 6, 2016
d1ec8ea
Merge branch 'activity#2' into issue#13
mdipirro May 6, 2016
a5db803
Add scratch checker
korut94 May 6, 2016
5e98846
Fix npm start command
mdipirro May 6, 2016
80d044a
Add documentation on test
Polpetta May 6, 2016
e1064b4
Remove example
Polpetta May 6, 2016
fb3802c
Push stuff
Polpetta May 6, 2016
d81174b
Change class name and add class method
drigoni May 6, 2016
d2e9ac3
False rule no-string-literal
korut94 May 6, 2016
f42016a
Create interface for the Map
korut94 May 6, 2016
5de5055
Implement method check
korut94 May 6, 2016
a51d2c3
Remove at type in the comments
korut94 May 6, 2016
dc781a6
Correct description of check's return type
korut94 May 6, 2016
906bc5d
Create file dslModes
korut94 May 6, 2016
0b63729
Correct imports
mdipirro May 6, 2016
1275cea
Correct test
mdipirro May 6, 2016
0fbbba1
Add example connection's data
mdipirro May 6, 2016
0b96bcb
Add example connection's data
mdipirro May 6, 2016
89b26b3
Add tags in typedoc
mdipirro May 6, 2016
669c5a1
Merge config
mdipirro May 6, 2016
57bf62f
Correct import and remove some methods
mdipirro May 6, 2016
11a8fa3
Add conenction tests
mdipirro May 6, 2016
ee22f60
Started the user model
WeissL May 7, 2016
49a1e6c
Delete modelTest
mdipirro May 7, 2016
e45f531
Correct routes import/export
mdipirro May 7, 2016
6bec125
Complete class
korut94 May 7, 2016
7dd8376
Add body parser
mdipirro May 7, 2016
b3cacd2
Set endpoints
mdipirro May 7, 2016
b54d601
Check the existance of structure before take its model
korut94 May 7, 2016
ad4ce2e
Implement some methods
drigoni May 7, 2016
219f598
Template for companyModelTest
drigoni May 7, 2016
8143786
Add some stuff
drigoni May 7, 2016
90bbef9
Add companyRouterTest and install chai
drigoni May 7, 2016
945125d
Replace all AssertionError with Error
korut94 May 7, 2016
03376d7
Add a space
Polpetta May 8, 2016
9a6c734
Created the module for the authentication
WeissL May 8, 2016
ff83744
Created the class levelChecker
WeissL May 8, 2016
c12de4f
Use definition to mongoose and add method
korut94 May 8, 2016
3cbe17e
Add methods update and delete. Use HTML for class'history.
korut94 May 8, 2016
7a1a510
Import mongoose
Polpetta May 9, 2016
c5e3192
Add test for DSLChecker
korut94 May 9, 2016
1319fc3
Static member extract type and model
korut94 May 9, 2016
642e8f8
Option noImplicitAny set false
korut94 May 9, 2016
10278c5
Merge branch 'issue#19' of github.com:BugBusterSWE/MaaS into issue#19
korut94 May 9, 2016
594abdd
Correct Lint errors
mdipirro May 9, 2016
8fc40ea
Merge branch 'issue#13' into issue#7
mdipirro May 9, 2016
e3e7b30
Correct Lint errors
mdipirro May 9, 2016
4e600ed
Merge pull request #20 from BugBusterSWE/issue#7
Polpetta May 9, 2016
b9adce6
Change some stuff
drigoni May 9, 2016
cbb4ee9
Try new key GPG
drigoni May 9, 2016
336b576
Test GPG
drigoni May 9, 2016
446e5e5
Test GPG
drigoni May 9, 2016
3981d32
Merge branch 'activity#2' into issue#5
Polpetta May 9, 2016
5dc3c45
Try GPG
Polpetta May 9, 2016
6d4aaad
Integration with @mdipirro code
Polpetta May 9, 2016
cd48072
Add interface
Polpetta May 9, 2016
a57a444
First draft
Polpetta May 9, 2016
18273ad
Add call on super class
Polpetta May 9, 2016
ff46c07
Use arrow function to store the this
korut94 May 9, 2016
bea39cc
Insert test
korut94 May 9, 2016
0fd22a6
Fix build errors
Polpetta May 9, 2016
ddb65ab
Add mongo parameters from json file
mdipirro May 9, 2016
cfa6298
Compliance syntax with the linter
korut94 May 9, 2016
27de9fa
Write getDatabase. Add notes for tests
Polpetta May 10, 2016
b3343bd
Add method createDb.
Polpetta May 10, 2016
314ce94
"no-string-literal" and "no-any" set to false
mdipirro May 10, 2016
ebe73dd
Add new methods and new todos
Polpetta May 10, 2016
365d0a9
Fix lint issues
Polpetta May 10, 2016
2cbfb96
Reset no-any to true
mdipirro May 10, 2016
92d8594
Add external configuration support
mdipirro May 10, 2016
05a11f3
Add a test for check the correct file reading
mdipirro May 10, 2016
72be2c3
First draft of 'deleteDb' method
Polpetta May 10, 2016
2b5de8d
Update getConfig description
mdipirro May 10, 2016
131bb03
Add mongoParameters.json. It is necessary to pass some tests
mdipirro May 10, 2016
608baab
Remove @todo
mdipirro May 10, 2016
4a64226
Write documentation
Polpetta May 10, 2016
0dd184e
Add more tests to do
Polpetta May 10, 2016
887cb01
Conflict resolved
mdipirro May 10, 2016
1689cd7
Working on tests
mdipirro May 10, 2016
e2c14c9
Merge branch 'issue#13' into issue#6
mdipirro May 10, 2016
8dd3bd3
Remove constructor parameters
mdipirro May 10, 2016
62926fe
Start writing tests
mdipirro May 10, 2016
79a01d4
Add getCompanies method
mdipirro May 10, 2016
92b0ae2
Add test for getCompanies
mdipirro May 10, 2016
bb25229
Add some routes
mdipirro May 10, 2016
dfbec4d
Merge branch 'activity#2' into issue#4
korut94 May 10, 2016
0f29c75
Use onReject and onFulfill to resolve the promise
korut94 May 10, 2016
720c0b8
Remove useless methedo
korut94 May 10, 2016
b299abd
Create class DSLRouter (to be implemented)
EmanueleC May 10, 2016
b9e63f9
Remove log printer
korut94 May 10, 2016
0f8cc27
Correct syntax for the linter's rule
korut94 May 10, 2016
e563a66
Add test file (to be implemented)
EmanueleC May 10, 2016
82cc7a0
Merge branch 'issue#3' into issue#22
WeissL May 11, 2016
409fb17
Merge remote-tracking branch 'origin/issue#4' into issue#22
WeissL May 11, 2016
49f01d8
Merge remote-tracking branch 'origin/issue#5' into issue#22
WeissL May 11, 2016
3fdcf17
Merge remote-tracking branch 'origin/issue#6' into issue#22
WeissL May 11, 2016
320018e
Merge remote-tracking branch 'origin/issue#9' into issue#22
WeissL May 11, 2016
22fb9bd
Merge remote-tracking branch 'origin/issue#10' into issue#22
WeissL May 11, 2016
157b016
Merge remote-tracking branch 'origin/issue#11' into issue#22
WeissL May 11, 2016
eb852b2
Add Helmet
mdipirro May 11, 2016
fb4f9d1
Merge remote-tracking branch 'origin/issue#12' into issue#22
WeissL May 11, 2016
fb3a21a
Add helment and cross platform
mdipirro May 11, 2016
f60eff4
Merge remote-tracking branch 'origin/issue#17' into issue#22
WeissL May 11, 2016
6f1945f
Merge remote-tracking branch 'origin/issue#18' into issue#22
WeissL May 11, 2016
ca2cf4a
Merge remote-tracking branch 'origin/issue#19' into issue#22
WeissL May 11, 2016
7f79057
Merge remote-tracking branch 'origin/issue#1' into issue#22
WeissL May 11, 2016
899cd06
Added methods to the abstract class and ctreated ModelInterface
WeissL May 11, 2016
25ab5ea
Things changed
WeissL May 12, 2016
c635522
Things done on models
WeissL May 12, 2016
fd8cbc1
Worked on models
WeissL May 12, 2016
2516d67
changes on Model to fix interface
WeissL May 12, 2016
1b7836f
Some fixing action
korut94 May 12, 2016
7b24677
Some corrective action
korut94 May 12, 2016
12a9246
Merge branch 'issue#22' of github.com:BugBusterSWE/MaaS into issue#22
korut94 May 12, 2016
1379aa8
Some fixes for authorization
WeissL May 13, 2016
b72ced0
Rename lib's files and add dcumentation
mdipirro May 13, 2016
28967d6
Add documentation
mdipirro May 13, 2016
6253c80
Fixed routes
WeissL May 13, 2016
6151a61
Add documentation and resolve some compilation errors
mdipirro May 13, 2016
b4f39b9
Add checkers
mdipirro May 13, 2016
9ad03ce
Resolve errors
mdipirro May 13, 2016
0016bf1
Resolve Lint errors
mdipirro May 13, 2016
44d2cfd
Add documentation
mdipirro May 13, 2016
953e18c
Resolve lint error
mdipirro May 13, 2016
47a2705
Add API's doc
mdipirro May 14, 2016
dd7a846
Add API's docs
mdipirro May 14, 2016
a7f788b
Add more API's doc
mdipirro May 14, 2016
1c9c4a4
Add api doc title and description
Polpetta May 14, 2016
ded89a1
Complete API's doc
mdipirro May 14, 2016
f7f66a6
Merge branch 'issue#22' of github.com:BugBusterSWE/MaaS into issue#22
mdipirro May 14, 2016
53ebb66
Fixed problems on models to compile
WeissL May 14, 2016
7e85087
Modifies for user credentials change
WeissL May 14, 2016
cc81340
Added descriptions on user model
WeissL May 14, 2016
4e2b91e
added DSLs for company
WeissL May 14, 2016
29ee7f3
added dashboard field on dsl model
WeissL May 14, 2016
46dba2e
setted the company databases list
WeissL May 14, 2016
86d4012
Added the superAdmin creation
WeissL May 14, 2016
237cd89
Added check on route and removed FIXME
WeissL May 14, 2016
7e009c6
Correct compile error
mdipirro May 15, 2016
bb3740e
Resolve compile errors on tests
mdipirro May 15, 2016
0bf5ae8
Add dslengine declaration
Polpetta May 15, 2016
d996f8d
Merge branch 'issue#22' of github.com:BugBusterSWE/MaaS into issue#22
Polpetta May 15, 2016
4b15dcf
Merge remote-tracking branch 'origin/issue#1' into issue#22
WeissL May 16, 2016
ff29742
Correct name file class
korut94 May 16, 2016
17ebaa9
Restore index.ts
korut94 May 16, 2016
49be238
Correct import path
korut94 May 16, 2016
7f1d09a
Merge pull request #31 from BugBusterSWE/issue#22
Polpetta May 16, 2016
8fe793a
Update devConfiguration.ts
korut94 May 16, 2016
53ba195
Update mongoConnection.ts
korut94 May 16, 2016
9b05226
Update index.ts
korut94 May 16, 2016
9754e67
Update prodConfiguration.ts
korut94 May 16, 2016
c97c917
Update authenticationChecker.ts
korut94 May 16, 2016
86547a8
Remove double dependences
Polpetta May 16, 2016
bd840bb
Update levelChecker.ts
korut94 May 16, 2016
5323a4f
Fix lint errors
Polpetta May 16, 2016
f280bc7
Update databaseModel.ts
korut94 May 16, 2016
7adf2ce
Update dslModel.ts
korut94 May 16, 2016
3ac744a
Update mongooseConnection.ts
korut94 May 16, 2016
6264746
Update userModel.ts
korut94 May 16, 2016
d127761
Update companyRouter.ts
korut94 May 16, 2016
963185d
Update databaseRouter.ts
korut94 May 16, 2016
1db98de
Update databaseModel.ts
korut94 May 16, 2016
8cee71e
Fix lint 80 columns
Polpetta May 16, 2016
14db029
Merge branch 'activity#2' of github.com:BugBusterSWE/MaaS into activi…
Polpetta May 16, 2016
15b7c20
using html
Polpetta May 16, 2016
42c608c
Update userRouter.ts
korut94 May 16, 2016
6cc8291
Merge branch 'master' into activity#2
korut94 May 16, 2016
edc1558
Merge branch 'activity#2' of github.com:BugBusterSWE/MaaS into activi…
korut94 May 16, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add external configuration support
  • Loading branch information
mdipirro committed May 10, 2016
commit 92d859492b9b482e3839b81c0479ec16f5f0fe36
9 changes: 4 additions & 5 deletions src/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import Configuration from "./configuration";
import DevConfiguration from "./devConfiguration";
import TestConfiguration from "./testConfiguration";
import ProdConfiguration from "./prodConfiguration";
import * as fs from "fs";
import {readFileSync} from "fs";

/**
Expand All @@ -26,16 +25,16 @@ class ChooseConfiguration {
*/
public static getConfig() : Configuration {
/** @todo parameters */
let params : JSON = JSON.parse(readFileSync(
"mongoParameters.json",
let params : MongoConnection = JSON.parse(readFileSync(
"src/config/mongoParameters.json",
"utf-8"
));
let connection : MongoConnection = new MongoConnection(
params["username"],
params["user"],
params["password"],
params["host"],
params["port"],
params["name"]
params["dbName"]
);
let serverSecret : string = "serverSecret";
let config : Configuration;
Expand Down