Skip to content

Commit deed490

Browse files
feat: rename license_name to license_title
1 parent 3a453bf commit deed490

File tree

5 files changed

+46
-12
lines changed

5 files changed

+46
-12
lines changed
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
"""rename column license name to license title
2+
3+
Revision ID: 8182d8c386f7
4+
Revises: 3499656b84e7
5+
Create Date: 2025-02-25 15:40:01.727396
6+
7+
"""
8+
9+
from typing import Sequence, Union
10+
11+
from alembic import op
12+
13+
14+
# revision identifiers, used by Alembic.
15+
revision: str = "8182d8c386f7"
16+
down_revision: Union[str, None] = "3499656b84e7"
17+
branch_labels: Union[str, Sequence[str], None] = None
18+
depends_on: Union[str, Sequence[str], None] = None
19+
20+
21+
def upgrade() -> None:
22+
# ### commands auto generated by Alembic - please adjust! ###
23+
op.alter_column(
24+
"dataset", "license_name", nullable=True, new_column_name="license_title"
25+
)
26+
# ### end Alembic commands ###
27+
28+
29+
def downgrade() -> None:
30+
# ### commands auto generated by Alembic - please adjust! ###
31+
op.alter_column(
32+
"dataset", "license_title", nullable=True, new_column_name="license_name"
33+
)
34+
# ### end Alembic commands ###

oc4ids_datastore_pipeline/database.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Dataset(Base):
2929
source_url: Mapped[str] = mapped_column(String)
3030
publisher_name: Mapped[str] = mapped_column(String)
3131
license_url: Mapped[Optional[str]] = mapped_column(String, nullable=True)
32-
license_name: Mapped[Optional[str]] = mapped_column(String, nullable=True)
32+
license_title: Mapped[Optional[str]] = mapped_column(String, nullable=True)
3333
json_url: Mapped[Optional[str]] = mapped_column(String, nullable=True)
3434
csv_url: Mapped[Optional[str]] = mapped_column(String, nullable=True)
3535
xlsx_url: Mapped[Optional[str]] = mapped_column(String, nullable=True)

oc4ids_datastore_pipeline/pipeline.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from oc4ids_datastore_pipeline.notifications import send_notification
1919
from oc4ids_datastore_pipeline.registry import (
2020
fetch_registered_datasets,
21-
get_license_name_from_url,
21+
get_license_title_from_url,
2222
)
2323
from oc4ids_datastore_pipeline.storage import delete_files_for_dataset, upload_files
2424

@@ -108,13 +108,13 @@ def save_dataset_metadata(
108108
try:
109109
publisher_name = json_data.get("publisher", {}).get("name", "")
110110
license_url = json_data.get("license", None)
111-
license_name = get_license_name_from_url(license_url) if license_url else None
111+
license_title = get_license_title_from_url(license_url) if license_url else None
112112
dataset = Dataset(
113113
dataset_id=dataset_id,
114114
source_url=source_url,
115115
publisher_name=publisher_name,
116116
license_url=license_url,
117-
license_name=license_name,
117+
license_title=license_title,
118118
json_url=json_url,
119119
csv_url=csv_url,
120120
xlsx_url=xlsx_url,

oc4ids_datastore_pipeline/registry.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def fetch_license_mappings() -> dict[str, str]:
5050
return {}
5151

5252

53-
def get_license_name_from_url(
53+
def get_license_title_from_url(
5454
url: str, force_refresh: Optional[bool] = False
5555
) -> Optional[str]:
5656
global _license_mappings

tests/test_registry.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from oc4ids_datastore_pipeline.registry import (
77
fetch_license_mappings,
88
fetch_registered_datasets,
9-
get_license_name_from_url,
9+
get_license_title_from_url,
1010
)
1111

1212

@@ -116,7 +116,7 @@ def test_fetch_license_mappings_catches_exception(
116116
assert result == {}
117117

118118

119-
def test_get_license_name_from_url(mocker: MockerFixture) -> None:
119+
def test_get_license_title_from_url(mocker: MockerFixture) -> None:
120120
patch_license_mappings = mocker.patch(
121121
"oc4ids_datastore_pipeline.registry.fetch_license_mappings"
122122
)
@@ -125,23 +125,23 @@ def test_get_license_name_from_url(mocker: MockerFixture) -> None:
125125
"https://license_2.com/license": "License 2",
126126
}
127127

128-
license_name = get_license_name_from_url(
128+
license_title = get_license_title_from_url(
129129
"https://license_2.com/license", force_refresh=True
130130
)
131131

132-
assert license_name == "License 2"
132+
assert license_title == "License 2"
133133

134134

135-
def test_get_license_name_from_url_not_in_mapping(mocker: MockerFixture) -> None:
135+
def test_get_license_title_from_url_not_in_mapping(mocker: MockerFixture) -> None:
136136
patch_license_mappings = mocker.patch(
137137
"oc4ids_datastore_pipeline.registry.fetch_license_mappings"
138138
)
139139
patch_license_mappings.return_value = {
140140
"https://license_1.com/license": "License 1",
141141
}
142142

143-
license_name = get_license_name_from_url(
143+
license_title = get_license_title_from_url(
144144
"https://license_2.com/license", force_refresh=True
145145
)
146146

147-
assert license_name is None
147+
assert license_title is None

0 commit comments

Comments
 (0)