Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Coscine
B
backend
apis
Project
Commits
19c22553
Commit
19c22553
authored
Jul 18, 2019
by
L. Ellenbeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactoring coscine/issues#157
parent
68dc0f68
Changes
13
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
81 additions
and
99 deletions
+81
-99
src/Project.Tests/DefaultControllerTests.cs
src/Project.Tests/DefaultControllerTests.cs
+21
-21
src/Project.Tests/ProjectControllerTests.cs
src/Project.Tests/ProjectControllerTests.cs
+22
-21
src/Project.Tests/ResourceControllerTests.cs
src/Project.Tests/ResourceControllerTests.cs
+15
-15
src/Project/Controllers/ProjectController.cs
src/Project/Controllers/ProjectController.cs
+1
-4
src/Project/Controllers/ResourceController.cs
src/Project/Controllers/ResourceController.cs
+4
-7
src/Project/Models/ProjectModel.cs
src/Project/Models/ProjectModel.cs
+4
-7
src/Project/Models/ProjectResourceModel.cs
src/Project/Models/ProjectResourceModel.cs
+2
-2
src/Project/Models/ProjectRoleModel.cs
src/Project/Models/ProjectRoleModel.cs
+2
-2
src/Project/Models/ResourceModel.cs
src/Project/Models/ResourceModel.cs
+4
-4
src/Project/Models/ResourceTypeModel.cs
src/Project/Models/ResourceTypeModel.cs
+2
-2
src/Project/Models/RoleModel.cs
src/Project/Models/RoleModel.cs
+4
-7
src/Project/Models/UserModel.cs
src/Project/Models/UserModel.cs
+0
-4
src/Project/Program.cs
src/Project/Program.cs
+0
-3
No files found.
src/Project.Tests/DefaultControllerTests.cs
View file @
19c22553
...
...
@@ -18,15 +18,15 @@ namespace Coscine.Api.Project.Tests
{
protected
T
Controller
{
get
;
}
protected
List
<
Coscine
.
Database
.
Model
.
Project
>
p
rojects
=
new
List
<
Coscine
.
Database
.
Model
.
Project
>();
protected
List
<
User
>
u
sers
=
new
List
<
User
>();
protected
List
<
ProjectRole
>
p
rojectRoles
=
new
List
<
ProjectRole
>();
protected
List
<
ResourceType
>
r
esourceTypes
=
new
List
<
ResourceType
>();
protected
List
<
Resource
>
r
esources
=
new
List
<
Resource
>();
protected
readonly
List
<
Coscine
.
Database
.
Model
.
Project
>
P
rojects
=
new
List
<
Coscine
.
Database
.
Model
.
Project
>();
protected
readonly
List
<
User
>
U
sers
=
new
List
<
User
>();
protected
readonly
List
<
ProjectRole
>
P
rojectRoles
=
new
List
<
ProjectRole
>();
protected
readonly
List
<
ResourceType
>
R
esourceTypes
=
new
List
<
ResourceType
>();
protected
readonly
List
<
Resource
>
R
esources
=
new
List
<
Resource
>();
protected
int
p
revious
;
protected
int
P
revious
;
p
ublic
DefaultControllerTests
(
T
controller
)
p
rotected
DefaultControllerTests
(
T
controller
)
{
Controller
=
controller
;
}
...
...
@@ -35,7 +35,7 @@ namespace Coscine.Api.Project.Tests
public
void
Setup
()
{
ProjectModel
projectModel
=
new
ProjectModel
();
p
revious
=
projectModel
.
GetAll
().
ToArray
().
Length
;
P
revious
=
projectModel
.
GetAll
().
ToArray
().
Length
;
UserModel
userModel
=
new
UserModel
();
...
...
@@ -46,7 +46,7 @@ namespace Coscine.Api.Project.Tests
};
userModel
.
Insert
(
user
);
u
sers
.
Add
(
user
);
U
sers
.
Add
(
user
);
FakeControllerContext
(
user
);
...
...
@@ -62,9 +62,9 @@ namespace Coscine.Api.Project.Tests
projectModel
.
Insert
(
project
);
var
projectRole
=
projectModel
.
SetOwner
(
project
,
user
);
p
rojectRoles
.
Add
(
projectRole
);
P
rojectRoles
.
Add
(
projectRole
);
p
rojects
.
Add
(
projectModel
.
GetById
(
project
.
Id
));
P
rojects
.
Add
(
projectModel
.
GetById
(
project
.
Id
));
var
project2
=
new
Coscine
.
Database
.
Model
.
Project
()
{
...
...
@@ -76,7 +76,7 @@ namespace Coscine.Api.Project.Tests
Keywords
=
"Test1;Test2"
};
projectModel
.
Insert
(
project2
);
p
rojects
.
Add
(
projectModel
.
GetById
(
project2
.
Id
));
P
rojects
.
Add
(
projectModel
.
GetById
(
project2
.
Id
));
ResourceTypeModel
resourceTypeModel
=
new
ResourceTypeModel
();
var
resourceType
=
new
ResourceType
()
...
...
@@ -84,7 +84,7 @@ namespace Coscine.Api.Project.Tests
DisplayName
=
"TestType"
};
resourceTypeModel
.
Insert
(
resourceType
);
r
esourceTypes
.
Add
(
resourceType
);
R
esourceTypes
.
Add
(
resourceType
);
ResourceModel
resourceModel
=
new
ResourceModel
();
var
resource
=
new
Resource
()
...
...
@@ -96,7 +96,7 @@ namespace Coscine.Api.Project.Tests
};
resourceModel
.
Insert
(
resource
);
projectModel
.
AddResource
(
project
,
resource
);
r
esources
.
Add
(
resource
);
R
esources
.
Add
(
resource
);
var
resource2
=
new
Resource
()
{
...
...
@@ -107,7 +107,7 @@ namespace Coscine.Api.Project.Tests
};
resourceModel
.
Insert
(
resource2
);
projectModel
.
AddResource
(
project2
,
resource2
);
r
esources
.
Add
(
resource2
);
R
esources
.
Add
(
resource2
);
}
...
...
@@ -149,32 +149,32 @@ namespace Coscine.Api.Project.Tests
public
void
End
()
{
ProjectRoleModel
projectRoleModel
=
new
ProjectRoleModel
();
foreach
(
var
projectRole
in
p
rojectRoles
)
foreach
(
var
projectRole
in
P
rojectRoles
)
{
projectRoleModel
.
Delete
(
projectRole
);
}
ProjectResourceModel
projectResourceModel
=
new
ProjectResourceModel
();
foreach
(
var
projectResource
in
projectResourceModel
.
GetAllWhere
((
projectResource
)
=>
projectResource
.
ResourceId
==
r
esources
[
0
].
Id
||
projectResource
.
ResourceId
==
r
esources
[
1
].
Id
))
foreach
(
var
projectResource
in
projectResourceModel
.
GetAllWhere
((
projectResource
)
=>
projectResource
.
ResourceId
==
R
esources
[
0
].
Id
||
projectResource
.
ResourceId
==
R
esources
[
1
].
Id
))
{
projectResourceModel
.
Delete
(
projectResource
);
}
ProjectModel
projectModel
=
new
ProjectModel
();
foreach
(
var
project
in
p
rojects
)
foreach
(
var
project
in
P
rojects
)
{
projectModel
.
Delete
(
project
);
}
UserModel
userModel
=
new
UserModel
();
foreach
(
var
user
in
u
sers
)
foreach
(
var
user
in
U
sers
)
{
userModel
.
Delete
(
user
);
}
ResourceModel
resourceModel
=
new
ResourceModel
();
foreach
(
var
resource
in
r
esources
)
foreach
(
var
resource
in
R
esources
)
{
resourceModel
.
Delete
(
resource
);
}
ResourceTypeModel
resourceTypeModel
=
new
ResourceTypeModel
();
foreach
(
var
resourceType
in
r
esourceTypes
)
foreach
(
var
resourceType
in
R
esourceTypes
)
{
resourceTypeModel
.
Delete
(
resourceType
);
}
...
...
src/Project.Tests/ProjectControllerTests.cs
View file @
19c22553
...
...
@@ -9,6 +9,7 @@ using System;
using
Coscine.ApiCommons.Exceptions
;
using
Coscine.ApiCommons.Factories
;
#region DupFinder Exclusion
namespace
Coscine.Api.Project.Tests
{
[
TestFixture
]
...
...
@@ -23,12 +24,12 @@ namespace Coscine.Api.Project.Tests
public
void
OwnsTest
()
{
ProjectModel
projectModel
=
new
ProjectModel
();
Assert
.
IsTrue
(
projectModel
.
OwnsProject
(
u
sers
[
0
],
p
rojects
[
0
]));
Assert
.
IsFalse
(
projectModel
.
OwnsProject
(
u
sers
[
0
],
p
rojects
[
1
]));
Assert
.
IsTrue
(
projectModel
.
OwnsProject
(
U
sers
[
0
],
P
rojects
[
0
]));
Assert
.
IsFalse
(
projectModel
.
OwnsProject
(
U
sers
[
0
],
P
rojects
[
1
]));
var
all
=
projectModel
.
GetAllWhere
((
project
)
=>
(
from
projectRole
in
project
.
ProjectRolesProjectIdIds
where
projectRole
.
User
==
u
sers
[
0
]
where
projectRole
.
User
==
U
sers
[
0
]
&&
projectRole
.
Role
.
DisplayName
==
"Owner"
select
projectRole
).
Any
()
);
...
...
@@ -45,7 +46,7 @@ namespace Coscine.Api.Project.Tests
[
Test
]
public
void
TestControllerGet
()
{
var
actionResult
=
Controller
.
Get
(
p
rojects
[
0
].
Id
.
ToString
());
var
actionResult
=
Controller
.
Get
(
P
rojects
[
0
].
Id
.
ToString
());
Assert
.
IsTrue
(
actionResult
.
GetType
()
==
typeof
(
OkObjectResult
));
OkObjectResult
okObjectResult
=
(
OkObjectResult
)
actionResult
;
...
...
@@ -53,30 +54,29 @@ namespace Coscine.Api.Project.Tests
ProjectObject
projectObject
=
(
ProjectObject
)
okObjectResult
.
Value
;
Assert
.
IsTrue
(
projectObject
.
Id
==
p
rojects
[
0
].
Id
);
Assert
.
IsTrue
(
projectObject
.
Description
==
p
rojects
[
0
].
Description
);
Assert
.
IsTrue
(
projectObject
.
DisplayName
==
p
rojects
[
0
].
DisplayName
);
Assert
.
IsTrue
(
projectObject
.
Organization
==
p
rojects
[
0
].
Organization
);
Assert
.
IsTrue
(
projectObject
.
StartDate
==
p
rojects
[
0
].
StartDate
);
Assert
.
IsTrue
(
projectObject
.
EndDate
==
p
rojects
[
0
].
EndDate
);
Assert
.
IsTrue
(
projectObject
.
Keywords
==
p
rojects
[
0
].
Keywords
);
Assert
.
IsTrue
(
projectObject
.
Id
==
P
rojects
[
0
].
Id
);
Assert
.
IsTrue
(
projectObject
.
Description
==
P
rojects
[
0
].
Description
);
Assert
.
IsTrue
(
projectObject
.
DisplayName
==
P
rojects
[
0
].
DisplayName
);
Assert
.
IsTrue
(
projectObject
.
Organization
==
P
rojects
[
0
].
Organization
);
Assert
.
IsTrue
(
projectObject
.
StartDate
==
P
rojects
[
0
].
StartDate
);
Assert
.
IsTrue
(
projectObject
.
EndDate
==
P
rojects
[
0
].
EndDate
);
Assert
.
IsTrue
(
projectObject
.
Keywords
==
P
rojects
[
0
].
Keywords
);
}
[
Test
]
public
void
TestControllerUpdate
()
{
var
actionResult
=
Controller
.
Get
(
projects
[
0
].
Id
.
ToString
());
OkObjectResult
okObjectResult
=
(
OkObjectResult
)
actionResult
;;
ProjectObject
projectObject
=
(
ProjectObject
)
okObjectResult
.
Value
;
var
actionResult
=
Controller
.
Get
(
Projects
[
0
].
Id
.
ToString
());
ProjectObject
projectObject
=
(
ProjectObject
)((
OkObjectResult
)
actionResult
).
Value
;
projectObject
.
Description
=
"ChangedDescription"
;
Stream
stream
=
ObjectFactory
<
ProjectObject
>.
SerializeToStream
(
projectObject
);
FakeControllerContext
(
u
sers
[
0
],
stream
);
FakeControllerContext
(
U
sers
[
0
],
stream
);
actionResult
=
Controller
.
Update
(
p
rojects
[
0
].
Id
.
ToString
());
actionResult
=
Controller
.
Update
(
P
rojects
[
0
].
Id
.
ToString
());
Assert
.
IsTrue
(
actionResult
.
GetType
()
==
typeof
(
OkObjectResult
));
// Cleanup
...
...
@@ -84,11 +84,11 @@ namespace Coscine.Api.Project.Tests
stream
=
ObjectFactory
<
ProjectObject
>.
SerializeToStream
(
projectObject
);
FakeControllerContext
(
u
sers
[
0
],
stream
);
FakeControllerContext
(
U
sers
[
0
],
stream
);
try
{
actionResult
=
Controller
.
Update
(
p
rojects
[
1
].
Id
.
ToString
());
Controller
.
Update
(
P
rojects
[
1
].
Id
.
ToString
());
Assert
.
Fail
();
}
catch
(
Exception
e
)
...
...
@@ -103,11 +103,11 @@ namespace Coscine.Api.Project.Tests
[
Test
]
public
void
TestControllerStore
()
{
ProjectObject
newProjectObject
=
new
ProjectObject
(
System
.
Guid
.
NewGuid
(),
"NewProject"
,
"NewDisplayName"
,
"NewOrganisation"
,
DateTime
.
Now
,
DateTime
.
Now
.
AddYears
(
1
),
"test2;test3"
);
ProjectObject
newProjectObject
=
new
ProjectObject
(
Guid
.
NewGuid
(),
"NewProject"
,
"NewDisplayName"
,
"NewOrganisation"
,
DateTime
.
Now
,
DateTime
.
Now
.
AddYears
(
1
),
"test2;test3"
);
var
stream
=
ObjectFactory
<
ProjectObject
>.
SerializeToStream
(
newProjectObject
);
FakeControllerContext
(
u
sers
[
0
],
stream
);
FakeControllerContext
(
U
sers
[
0
],
stream
);
var
actionResult
=
Controller
.
Store
();
Assert
.
IsTrue
(
actionResult
.
GetType
()
==
typeof
(
OkObjectResult
));
...
...
@@ -142,7 +142,8 @@ namespace Coscine.Api.Project.Tests
public
void
CountTest
()
{
ProjectModel
projectModel
=
new
ProjectModel
();
Assert
.
IsTrue
(
p
revious
==
projectModel
.
GetAll
().
ToArray
().
Length
-
p
rojects
.
Count
);
Assert
.
IsTrue
(
P
revious
==
projectModel
.
GetAll
().
ToArray
().
Length
-
P
rojects
.
Count
);
}
}
}
#
endregion
\ No newline at end of file
src/Project.Tests/ResourceControllerTests.cs
View file @
19c22553
...
...
@@ -27,7 +27,7 @@ namespace Coscine.Api.Project.Tests
[
Test
]
public
void
TestControllerGet
()
{
var
actionResult
=
Controller
.
Get
(
r
esources
[
0
].
Id
.
ToString
());
var
actionResult
=
Controller
.
Get
(
R
esources
[
0
].
Id
.
ToString
());
Assert
.
IsTrue
(
actionResult
.
GetType
()
==
typeof
(
OkObjectResult
));
OkObjectResult
okObjectResult
=
(
OkObjectResult
)
actionResult
;
...
...
@@ -35,18 +35,18 @@ namespace Coscine.Api.Project.Tests
ResourceObject
projectObject
=
(
ResourceObject
)
okObjectResult
.
Value
;
Assert
.
IsTrue
(
projectObject
.
Id
==
r
esources
[
0
].
Id
);
Assert
.
IsTrue
(
projectObject
.
ExternalId
==
r
esources
[
0
].
ExternalId
);
Assert
.
IsTrue
(
projectObject
.
Type
.
Id
==
r
esources
[
0
].
Type
.
Id
);
Assert
.
IsTrue
(
projectObject
.
Type
.
DisplayName
==
r
esources
[
0
].
Type
.
DisplayName
);
Assert
.
IsTrue
(
projectObject
.
Url
==
r
esources
[
0
].
Url
);
Assert
.
IsTrue
(
projectObject
.
Id
==
R
esources
[
0
].
Id
);
Assert
.
IsTrue
(
projectObject
.
ExternalId
==
R
esources
[
0
].
ExternalId
);
Assert
.
IsTrue
(
projectObject
.
Type
.
Id
==
R
esources
[
0
].
Type
.
Id
);
Assert
.
IsTrue
(
projectObject
.
Type
.
DisplayName
==
R
esources
[
0
].
Type
.
DisplayName
);
Assert
.
IsTrue
(
projectObject
.
Url
==
R
esources
[
0
].
Url
);
}
[
Test
]
public
void
TestControllerUpdate
()
{
var
actionResult
=
Controller
.
Get
(
r
esources
[
0
].
Id
.
ToString
());
var
actionResult
=
Controller
.
Get
(
R
esources
[
0
].
Id
.
ToString
());
OkObjectResult
okObjectResult
=
(
OkObjectResult
)
actionResult
;
ResourceObject
resourceObject
=
(
ResourceObject
)
okObjectResult
.
Value
;
...
...
@@ -54,9 +54,9 @@ namespace Coscine.Api.Project.Tests
Stream
stream
=
ObjectFactory
<
ResourceObject
>.
SerializeToStream
(
resourceObject
);
FakeControllerContext
(
u
sers
[
0
],
stream
);
FakeControllerContext
(
U
sers
[
0
],
stream
);
actionResult
=
Controller
.
Update
(
r
esources
[
0
].
Id
.
ToString
());
actionResult
=
Controller
.
Update
(
R
esources
[
0
].
Id
.
ToString
());
Assert
.
IsTrue
(
actionResult
.
GetType
()
==
typeof
(
OkObjectResult
));
// Cleanup
...
...
@@ -64,11 +64,11 @@ namespace Coscine.Api.Project.Tests
stream
=
ObjectFactory
<
ResourceObject
>.
SerializeToStream
(
resourceObject
);
FakeControllerContext
(
u
sers
[
0
],
stream
);
FakeControllerContext
(
U
sers
[
0
],
stream
);
try
{
actionResult
=
Controller
.
Update
(
r
esources
[
1
].
Id
.
ToString
());
Controller
.
Update
(
R
esources
[
1
].
Id
.
ToString
());
Assert
.
Fail
();
}
catch
(
Exception
e
)
...
...
@@ -83,13 +83,13 @@ namespace Coscine.Api.Project.Tests
[
Test
]
public
void
TestControllerStoreToProject
()
{
ResourceObject
resourceObject
=
new
ResourceObject
(
Guid
.
NewGuid
(),
"externalId"
,
"http://rwth-aachen.de/newTest"
,
new
ResourceTypeObject
(
r
esourceTypes
[
0
].
Id
,
r
esourceTypes
[
0
].
DisplayName
));
ResourceObject
resourceObject
=
new
ResourceObject
(
Guid
.
NewGuid
(),
"externalId"
,
"http://rwth-aachen.de/newTest"
,
new
ResourceTypeObject
(
R
esourceTypes
[
0
].
Id
,
R
esourceTypes
[
0
].
DisplayName
));
Stream
stream
=
ObjectFactory
<
ResourceObject
>.
SerializeToStream
(
resourceObject
);
FakeControllerContext
(
u
sers
[
0
],
stream
);
FakeControllerContext
(
U
sers
[
0
],
stream
);
var
actionResult
=
Controller
.
StoreToProject
(
p
rojects
[
0
].
Id
.
ToString
());
var
actionResult
=
Controller
.
StoreToProject
(
P
rojects
[
0
].
Id
.
ToString
());
Assert
.
IsTrue
(
actionResult
.
GetType
()
==
typeof
(
OkObjectResult
));
OkObjectResult
okObjectResult
=
(
OkObjectResult
)
actionResult
;
resourceObject
=
(
ResourceObject
)
okObjectResult
.
Value
;
...
...
@@ -101,7 +101,7 @@ namespace Coscine.Api.Project.Tests
var
resource
=
resourceModel
.
GetById
(
resourceObject
.
Id
);
ProjectResourceModel
projectResourceModel
=
new
ProjectResourceModel
();
foreach
(
var
projectResource
in
projectResourceModel
.
GetAllWhere
((
projectResource
)
=>
projectResource
.
ProjectId
==
p
rojects
[
0
].
Id
&&
projectResource
.
ResourceId
==
resource
.
Id
))
foreach
(
var
projectResource
in
projectResourceModel
.
GetAllWhere
((
projectResource
)
=>
projectResource
.
ProjectId
==
P
rojects
[
0
].
Id
&&
projectResource
.
ResourceId
==
resource
.
Id
))
{
projectResourceModel
.
Delete
(
projectResource
);
}
...
...
src/Project/Controllers/ProjectController.cs
View file @
19c22553
...
...
@@ -29,10 +29,7 @@ namespace Coscine.Api.Project.Controllers
where
projectRole
.
User
==
user
&&
projectRole
.
Role
.
DisplayName
==
"Owner"
select
projectRole
).
Any
()
).
Select
((
project
)
=>
{
return
new
ProjectObject
(
project
.
Id
,
project
.
Description
,
project
.
DisplayName
,
project
.
Organization
,
project
.
StartDate
,
project
.
EndDate
,
project
.
Keywords
);
});
).
Select
((
project
)
=>
new
ProjectObject
(
project
.
Id
,
project
.
Description
,
project
.
DisplayName
,
project
.
Organization
,
project
.
StartDate
,
project
.
EndDate
,
project
.
Keywords
));
}));
}
...
...
src/Project/Controllers/ResourceController.cs
View file @
19c22553
...
...
@@ -31,10 +31,7 @@ namespace Coscine.Api.Project.Controllers
&&
projectRole
.
Role
.
DisplayName
==
"Owner"
select
projectRole
).
Any
()
select
projectResource
).
Any
()
).
Select
((
resource
)
=>
{
return
new
ResourceObject
(
resource
.
Id
,
resource
.
ExternalId
,
resource
.
Url
,
new
ResourceTypeObject
(
resource
.
Type
.
Id
,
resource
.
Type
.
DisplayName
));
});
).
Select
((
resource
)
=>
new
ResourceObject
(
resource
.
Id
,
resource
.
ExternalId
,
resource
.
Url
,
new
ResourceTypeObject
(
resource
.
Type
.
Id
,
resource
.
Type
.
DisplayName
)));
}));
}
...
...
@@ -84,15 +81,15 @@ namespace Coscine.Api.Project.Controllers
}));
}
[
HttpPost
(
"[controller]/project/{project
_i
d}"
)]
public
IActionResult
StoreToProject
(
string
project
_i
d
)
[
HttpPost
(
"[controller]/project/{project
I
d}"
)]
public
IActionResult
StoreToProject
(
string
project
I
d
)
{
return
Ok
(
_authenticator
.
ValidateAndExecute
((
user
)
=>
{
ResourceObject
resourceObject
=
ObjectFactory
<
ResourceObject
>.
DeserializeFromStream
(
Request
.
Body
);
ProjectModel
projectModel
=
new
ProjectModel
();
var
project
=
projectModel
.
GetById
(
Guid
.
Parse
(
project
_i
d
));
var
project
=
projectModel
.
GetById
(
Guid
.
Parse
(
project
I
d
));
if
(
projectModel
.
OwnsProject
(
user
,
project
))
{
ResourceModel
resourceModel
=
new
ResourceModel
();
...
...
src/Project/Models/ProjectModel.cs
View file @
19c22553
...
...
@@ -49,14 +49,11 @@ namespace Coscine.Api.Project.Models
public
bool
OwnsProject
(
User
user
,
Coscine
.
Database
.
Model
.
Project
project
)
{
return
DatabaseConnection
.
ConnectToDatabase
((
db
)
=>
{
return
(
from
relation
in
db
.
ProjectRoles
return
DatabaseConnection
.
ConnectToDatabase
((
db
)
=>
(
from
relation
in
db
.
ProjectRoles
where
relation
.
Project
==
project
&&
relation
.
User
==
user
&&
relation
.
Role
.
DisplayName
==
"Owner"
select
relation
).
Any
();
});
select
relation
).
Any
());
}
public
void
AddResource
(
Coscine
.
Database
.
Model
.
Project
project
,
Resource
resource
)
...
...
@@ -96,9 +93,9 @@ namespace Coscine.Api.Project.Models
return
db
.
Projects
;
}
public
override
void
SetObjectId
(
Database
.
Model
.
Project
databaseObject
,
Guid
I
d
)
public
override
void
SetObjectId
(
Database
.
Model
.
Project
databaseObject
,
Guid
i
d
)
{
databaseObject
.
Id
=
I
d
;
databaseObject
.
Id
=
i
d
;
}
}
}
src/Project/Models/ProjectResourceModel.cs
View file @
19c22553
...
...
@@ -22,9 +22,9 @@ namespace Coscine.Api.Project.Models
return
db
.
ProjectResources
;
}
public
override
void
SetObjectId
(
ProjectResource
databaseObject
,
Guid
I
d
)
public
override
void
SetObjectId
(
ProjectResource
databaseObject
,
Guid
i
d
)
{
databaseObject
.
RelationId
=
I
d
;
databaseObject
.
RelationId
=
i
d
;
}
}
}
\ No newline at end of file
src/Project/Models/ProjectRoleModel.cs
View file @
19c22553
...
...
@@ -23,9 +23,9 @@ namespace Coscine.Api.Project.Models
return
db
.
ProjectRoles
;
}
public
override
void
SetObjectId
(
ProjectRole
databaseObject
,
Guid
I
d
)
public
override
void
SetObjectId
(
ProjectRole
databaseObject
,
Guid
i
d
)
{
databaseObject
.
RelationId
=
I
d
;
databaseObject
.
RelationId
=
i
d
;
}
}
}
src/Project/Models/ResourceModel.cs
View file @
19c22553
...
...
@@ -21,9 +21,9 @@ namespace Coscine.Api.Project.Models
{
ExternalId
=
resourceObject
.
ExternalId
,
Url
=
resourceObject
.
Url
,
TypeId
=
resourceObject
.
Type
.
Id
TypeId
=
resourceObject
.
Type
.
Id
,
Type
=
new
ResourceTypeModel
().
GetById
(
resourceObject
.
Type
.
Id
)
};
resource
.
Type
=
new
ResourceTypeModel
().
GetById
(
resourceObject
.
Type
.
Id
);
Insert
(
resource
);
return
resource
;
}
...
...
@@ -51,9 +51,9 @@ namespace Coscine.Api.Project.Models
return
db
.
Resources
;
}
public
override
void
SetObjectId
(
Resource
databaseObject
,
Guid
I
d
)
public
override
void
SetObjectId
(
Resource
databaseObject
,
Guid
i
d
)
{
databaseObject
.
Id
=
I
d
;
databaseObject
.
Id
=
i
d
;
}
public
int
UpdateByObject
(
Resource
resource
,
ResourceObject
resourceObject
)
...
...
src/Project/Models/ResourceTypeModel.cs
View file @
19c22553
...
...
@@ -23,9 +23,9 @@ namespace Coscine.Api.Project.Models
return
db
.
ResourceTypes
;
}
public
override
void
SetObjectId
(
ResourceType
databaseObject
,
Guid
I
d
)
public
override
void
SetObjectId
(
ResourceType
databaseObject
,
Guid
i
d
)
{
databaseObject
.
Id
=
I
d
;
databaseObject
.
Id
=
i
d
;
}
}
}
src/Project/Models/RoleModel.cs
View file @
19c22553
...
...
@@ -25,20 +25,17 @@ namespace Coscine.Api.Project.Models
return
db
.
Roles
;
}
public
override
void
SetObjectId
(
Role
databaseObject
,
Guid
I
d
)
public
override
void
SetObjectId
(
Role
databaseObject
,
Guid
i
d
)
{
databaseObject
.
Id
=
I
d
;
databaseObject
.
Id
=
i
d
;
}
public
Role
GetOwnerRole
()
{
return
DatabaseConnection
.
ConnectToDatabase
((
db
)
=>
{
return
return
DatabaseConnection
.
ConnectToDatabase
((
db
)
=>
(
from
tableEntry
in
GetITableFromDatabase
(
db
)
where
tableEntry
.
DisplayName
==
"Owner"
select
tableEntry
).
First
();
});
select
tableEntry
).
First
());
}
}
}
src/Project/Models/UserModel.cs
View file @
19c22553
using
Coscine.ApiCommons.Models
;
using
Coscine.Database.Model
;
using
LinqToDB
;
using
System
;
using
System.Linq.Expressions
;
namespace
Coscine.Api.Project.Models
{
...
...
src/Project/Program.cs
View file @
19c22553
using
Coscine.ApiCommons
;
using
Coscine.Configuration
;
using
Microsoft.AspNetCore.Hosting
;
using
Microsoft.Extensions.DependencyInjection
;
using
System.IO
;
namespace
Coscine.Api.Project
{
...
...
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