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.

Sign up for GitHub

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

Jump to bottom

fix: Use shortname for project export (DEV-3430) #3169

Merged
merged 3 commits into from
Apr 5, 2024
Merged

fix: Use shortname for project export (DEV-3430) #3169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0fe3b6
fix: Use shortcode instead of shortname (DEV-3430)
siers Apr 4, 2024
a5badb5
Merge branch 'main' into fix/fix-shortcode-DEV-3430
siers Apr 4, 2024
e72d462
Merge branch 'main' into fix/fix-shortcode-DEV-3430
siers Apr 5, 2024
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
4 changes: 2 additions & 2 deletions webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/ProjectExportResponse.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
implicit val codec: JsonCodec[ProjectImportResponse] = DeriveJsonCodec.gen[ProjectImportResponse]
}

case class ProjectExportInfoResponse(projectShortname: String, location: String)
case class ProjectExportInfoResponse(projectShortcode: String, location: String)
object ProjectExportInfoResponse {
def apply(info: ProjectExportInfo) =
new ProjectExportInfoResponse(info.projectShortname, info.path.toFile.toPath.toAbsolutePath.toString)
new ProjectExportInfoResponse(info.projectShortcode, info.path.toFile.toPath.toAbsolutePath.toString)

Check warning on line 21 in webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/ProjectExportResponse.scala

View check run for this annotation

Codecov / codecov/patch

webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/ProjectExportResponse.scala#L21 

Added line #L21 was not covered by tests

implicit val codec: JsonCodec[ProjectExportInfoResponse] = DeriveJsonCodec.gen[ProjectExportInfoResponse]
}
2 changes: 1 addition & 1 deletion .../main/scala/org/knora/webapi/slice/admin/domain/service/ProjectExportStorageService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import org.knora.webapi.slice.admin.domain.model.KnoraProject
import org.knora.webapi.slice.admin.domain.model.KnoraProject.Shortcode
import org.knora.webapi.slice.admin.domain.service.ProjectExportStorageService.exportFileEnding

case class ProjectExportInfo(projectShortname: String, path: Path)
case class ProjectExportInfo(projectShortcode: String, path: Path)

trait ProjectExportStorageService {

Expand Down