Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Coscine
backend
apis
Project
Commits
29cbe034
Commit
29cbe034
authored
Jul 03, 2020
by
Marcel Nellesen
Browse files
Fix: Fixed the Tests
parent
fb64ff00
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/Project.Tests/Project.Tests.csproj
View file @
29cbe034
...
...
@@ -66,7 +66,7 @@
<HintPath>
..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.Database, Version=1.22.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Database.1.22.0-
topic-858-quotaa
000
2
\lib\net461\Coscine.Database.dll
</HintPath>
<HintPath>
..\packages\Coscine.Database.1.22.0-
sprint-2020-11-
000
7
\lib\net461\Coscine.Database.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=e1ed402bc3f6525e, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Logging.1.2.0\lib\net461\Coscine.Logging.dll
</HintPath>
...
...
src/Project.Tests/packages.config
View file @
29cbe034
...
...
@@ -7,7 +7,7 @@
<
package
id
=
"Coscine.Action"
version
=
"1.13.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.ApiCommons"
version
=
"1.8.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Configuration"
version
=
"1.5.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Database"
version
=
"1.22.0-
topic-858-quotaa
000
2
"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Database"
version
=
"1.22.0-
sprint-2020-11-
000
7
"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Logging"
version
=
"1.2.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.ProxyApi"
version
=
"1.2.1"
targetFramework
=
"net472"
/>
<
package
id
=
"EntityFramework"
version
=
"6.2.0"
targetFramework
=
"net472"
/>
...
...
src/Project/Controllers/ProjectController.cs
View file @
29cbe034
...
...
@@ -223,51 +223,42 @@ namespace Coscine.Api.Project.Controllers
}
}
var
projectResourceModel
=
new
ProjectResourceModel
();
ResourceModel
resourceModel
=
new
ResourceModel
();
foreach
(
var
projectResource
in
projectResourceModel
.
GetAllWhere
((
projectResource
)
=>
projectResource
.
ProjectId
==
project
.
Id
))
if
(
isHard
)
{
if
(
isHard
)
var
projectResourceModel
=
new
ProjectResourceModel
();
ResourceModel
resourceModel
=
new
ResourceModel
();
foreach
(
var
projectResource
in
projectResourceModel
.
GetAllWhere
((
projectResource
)
=>
projectResource
.
ProjectId
==
project
.
Id
))
{
projectResourceModel
.
Delete
(
projectResource
);
resourceModel
.
Delete
(
resourceModel
.
GetById
(
projectResource
.
ResourceId
));
}
}
var
projectRoleModel
=
new
ProjectRoleModel
();
foreach
(
var
projectRole
in
projectRoleModel
.
GetAllWhere
((
projectRole
)
=>
projectRole
.
ProjectId
==
project
.
Id
))
{
if
(
isHard
)
var
projectRoleModel
=
new
ProjectRoleModel
();
foreach
(
var
projectRole
in
projectRoleModel
.
GetAllWhere
((
projectRole
)
=>
projectRole
.
ProjectId
==
project
.
Id
))
{
projectRoleModel
.
Delete
(
projectRole
);
}
}
var
projectDisciplineModel
=
new
ProjectDisciplineModel
();
foreach
(
var
projectDiscipline
in
projectDisciplineModel
.
GetAllWhere
((
projectDiscipline
)
=>
projectDiscipline
.
ProjectId
==
project
.
Id
))
{
if
(
isHard
)
var
projectDisciplineModel
=
new
ProjectDisciplineModel
();
foreach
(
var
projectDiscipline
in
projectDisciplineModel
.
GetAllWhere
((
projectDiscipline
)
=>
projectDiscipline
.
ProjectId
==
project
.
Id
))
{
projectDisciplineModel
.
Delete
(
projectDiscipline
);
}
}
var
projectInstituteModel
=
new
ProjectInstituteModel
();
foreach
(
var
projectInstitute
in
projectInstituteModel
.
GetAllWhere
((
projectInstitute
)
=>
projectInstitute
.
ProjectId
==
project
.
Id
))
{
if
(
isHard
)
var
projectInstituteModel
=
new
ProjectInstituteModel
();
foreach
(
var
projectInstitute
in
projectInstituteModel
.
GetAllWhere
((
projectInstitute
)
=>
projectInstitute
.
ProjectId
==
project
.
Id
))
{
projectInstituteModel
.
Delete
(
projectInstitute
);
projectInstituteModel
.
Delete
(
projectInstitute
);
}
var
projectQuotaModel
=
new
ProjectQuotaModel
();
foreach
(
var
projectQuota
in
projectQuotaModel
.
GetAllWhere
((
Quota
)
=>
Quota
.
ProjectId
==
project
.
Id
))
{
projectQuotaModel
.
Delete
(
projectQuota
);
}
}
if
(
isHard
)
{
_activatedFeaturesModel
.
DeactivateAllFeatures
(
project
);
}
if
(
isHard
)
{
if
(
propegateAction
)
{
_emitter
.
EmitProjectDelete
(
new
ProjectEventArgs
(
_configuration
)
...
...
@@ -275,12 +266,9 @@ namespace Coscine.Api.Project.Controllers
Project
=
project
});
}
}
if
(
isHard
)
{
_projectModel
.
HardDelete
(
project
);
}
}
else
{
_projectModel
.
Delete
(
project
);
...
...
src/Project/Project.csproj
View file @
29cbe034
...
...
@@ -59,7 +59,7 @@
<HintPath>
..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.Database, Version=1.22.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Database.1.22.0-
topic-858-quotaa
000
2
\lib\net461\Coscine.Database.dll
</HintPath>
<HintPath>
..\packages\Coscine.Database.1.22.0-
sprint-2020-11-
000
7
\lib\net461\Coscine.Database.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=e1ed402bc3f6525e, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Logging.1.2.0\lib\net461\Coscine.Logging.dll
</HintPath>
...
...
src/Project/packages.config
View file @
29cbe034
...
...
@@ -7,7 +7,7 @@
<
package
id
=
"Coscine.Action"
version
=
"1.13.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.ApiCommons"
version
=
"1.8.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Configuration"
version
=
"1.5.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Database"
version
=
"1.22.0-
topic-858-quotaa
000
2
"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Database"
version
=
"1.22.0-
sprint-2020-11-
000
7
"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Logging"
version
=
"1.2.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.ProxyApi"
version
=
"1.2.1"
targetFramework
=
"net472"
/>
<
package
id
=
"EntityFramework"
version
=
"6.2.0"
targetFramework
=
"net472"
/>
...
...
Write
Preview
Supports
Markdown
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!
Cancel
Please
register
or
sign in
to comment