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

chore(models-project): delete dead code #798

Merged
merged 4 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
55 changes: 2 additions & 53 deletions src/dsp_tools/commands/project/models/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

from dsp_tools.commands.project.models.model import Model
from dsp_tools.models.exceptions import BaseError
from dsp_tools.models.langstring import LangString, Languages
from dsp_tools.models.langstring import LangString
from dsp_tools.utils.connection import Connection


Expand Down Expand Up @@ -57,11 +57,9 @@ class Project(Model):

description : LangString
DSP project description in a given language (Languages.EN, Languages.DE, Languages.FR, Languages.IT).
A desciption can be add/replaced or removed with the methods ``addDescription``and ``rmDescription``.

keywords : set[str]
Set of keywords describing the project. Keywords can be added/removed by the methods ``addKeyword``
and ``rmKeyword``
Set of keywords describing the project.

ontologies : set[str]
Set if IRI's of the ontologies attached to the project [readonly]
Expand Down Expand Up @@ -196,29 +194,6 @@ def description(self, value: Optional[LangString]) -> None:
self._description = LangString(value)
self._changed.add("description")

def addDescription(self, lang: Union[Languages, str], value: str) -> None:
"""
Add/replace a project description with the given language (executed at next update)

:param lang: The language the description is in, either a string "EN", "DE", "FR", "IT" or a Language instance
:param value: The text of the description
:return: None
"""

self._description[lang] = value
self._changed.add("description")

def rmDescription(self, lang: Union[Languages, str]) -> None:
"""
Remove a description from a project (executed at next update)

:param lang: language of the description, either "EN", "DE", "FR", "IT", "RM", or a Language instance
:return: None
"""

del self._description[lang]
self._changed.add("description")

@property
def keywords(self) -> set[str]:
return self._keywords
Expand All @@ -234,32 +209,6 @@ def keywords(self, value: Union[list[str], set[str]]) -> None:
else:
raise BaseError("Must be a set of strings!")

def addKeyword(self, value: str) -> None:
"""
Add a new keyword to the set of keywords. (executed at next update)
May raise a BaseError

:param value: keyword
:return: None
"""

self._keywords.add(value)
self._changed.add("keywords")

def rmKeyword(self, value: str) -> None:
"""
Remove a keyword from the list of keywords (executed at next update)
May raise a BaseError

:param value: keyword
:return: None
"""
try:
self._keywords.remove(value)
except KeyError as ke:
raise BaseError('Keyword "' + value + '" is not in keyword set') from ke
self._changed.add("keywords")

@property
def ontologies(self) -> set[str]:
return self._ontologies
Expand Down
7 changes: 0 additions & 7 deletions test/e2e/commands/project/test_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,22 +106,15 @@ def test_project_update(self) -> None:

project.shortname = "update_project"
project.longname = "Update Project"
project.addDescription("fr", "Projet modifié")
project.rmDescription("de")
project.selfjoin = True
project.status = False
project.rmKeyword("project")
project.addKeyword("updated")
updated_project = project.update()

self.assertEqual(updated_project.shortcode, "0FF1")
self.assertEqual(updated_project.shortname, "update_project")
self.assertEqual(updated_project.longname, "Update Project")
self.assertEqual(updated_project.description["en"], "Project to be updated")
self.assertEqual(updated_project.description["fr"], "Projet modifié")
self.assertEqual(updated_project.selfjoin, True)
self.assertEqual(updated_project.status, False)
self.assertEqual(updated_project.keywords, {"test", "updated"})

def test_project_delete(self) -> None:
project = Project(
Expand Down