Rename "Placemarks" in "Places"

Author: RemiBardon

Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/MonkiProjects/monki-projects-model-swift",
         "state": {
           "branch": null,
-          "revision": "e900b58d719939fefcd09172b432d6f0c2fe2b43",
-          "version": "0.3.4"
+          "revision": "b6557a9e8d4bf6ed6dadc239759d567985a75370",
+          "version": "0.4.0"
         }
       }
     ]

Package.swift

@@ -19,7 +19,7 @@ let package = Package(
 		.package(
 			name: "monki-projects-model",
 			url: "https://github.com/MonkiProjects/monki-projects-model-swift",
-			.upToNextMajor(from: "0.3.4")
+			.upToNextMajor(from: "0.4.0")
 		),
 	],
 	targets: [

Sources/MonkiProjectsAPIClient/Helpers/PlacemarkState+QueryItems.swift renamed to Sources/MonkiProjectsAPIClient/Helpers/PlaceState+QueryItems.swift

@@ -1,5 +1,5 @@
 //
-//  PlacemarkState+QueryItems.swift
+//  PlaceState+QueryItems.swift
 //  MonkiProjectsAPIClient
 //
 //  Created by Rémi Bardon on 22/05/2021.
@@ -10,7 +10,7 @@ import Foundation
 import Networking
 import MonkiMapModel
 
-extension Placemark.State: QueryParam {
+extension Place.State: QueryParam {
 
 	public var queryItems: [URLQueryItem] {
 		return [.init(name: "state", value: self.rawValue)]

Sources/MonkiProjectsAPIClient/MPAPIPlacemarkRepository.swift renamed to Sources/MonkiProjectsAPIClient/MPAPIPlaceRepository.swift

@@ -1,5 +1,5 @@
 //
-//  MPAPIPlacemarkRepository.swift
+//  MPAPIPlaceRepository.swift
 //  MonkiProjectsAPIClient
 //
 //  Created by Rémi Bardon on 02/05/2021.
@@ -12,7 +12,7 @@ import Combine
 import MonkiProjectsModel
 import MonkiMapModel
 
-public final class MPAPIPlacemarkRepository: WebAPI, WebPlacemarksRepository {
+public final class MPAPIPlaceRepository: WebAPI, WebPlacesRepository {
 
 	/// # Notes
 	///
@@ -29,36 +29,36 @@ public final class MPAPIPlacemarkRepository: WebAPI, WebPlacemarksRepository {
 
 	// MARK: - Combine Publishers
 
-	public func listPlacemarks(
-		state: Placemark.State? = nil,
+	public func listPlaces(
+		state: Place.State? = nil,
 		page: PageRequest? = nil
-	) -> AnyPublisher<Page<Placemark.Public>, Error> {
-		return self.authenticatedRequest(endpoints.listPlacemarks(state: state, page: page))
+	) -> AnyPublisher<Page<Place.Public>, Error> {
+		return self.authenticatedRequest(endpoints.listPlaces(state: state, page: page))
 	}
 
 	// MARK: - Swift async/await
 
 	@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
-	public func listPlacemarks(
-		state: Placemark.State? = nil,
+	public func listPlaces(
+		state: Place.State? = nil,
 		page: PageRequest? = nil
-	) async throws -> Page<Placemark.Public> {
-		return try await self.authenticatedRequest(endpoints.listPlacemarks(state: state, page: page))
+	) async throws -> Page<Place.Public> {
+		return try await self.authenticatedRequest(endpoints.listPlaces(state: state, page: page))
 	}
 
 }
 
-extension MPAPIPlacemarkRepository {
+extension MPAPIPlaceRepository {
 
 	internal struct Endpoints: APIEndpoints {
 
 		let server: APIServer
 
-		func listPlacemarks(
-			state: Placemark.State? = nil,
+		func listPlaces(
+			state: Place.State? = nil,
 			page: PageRequest? = nil
 		) -> Endpoint {
-			return self.get("/placemarks/v1", queryItems: state.queryItems + page.queryItems)
+			return self.get("/places/v1", queryItems: state.queryItems + page.queryItems)
 		}
 
 	}

Sources/MonkiProjectsAPIClient/MonkiProjectsAPIs.swift

@@ -55,8 +55,8 @@ public final class MonkiProjectsAPIs: ObservableObject {
 	/// Monki Projects' Auth API
 	public var authAPI: WebAuthRepository
 
-	/// Monki Projects' Placemarks API
-	public var placemarksAPI: WebPlacemarksRepository
+	/// Monki Projects' Places API
+	public var placesAPI: WebPlacesRepository
 
 	// MARK: - Lifecycle
 
@@ -68,7 +68,7 @@ public final class MonkiProjectsAPIs: ObservableObject {
 		self.session = WebAPISession(server: server.wrappedValue, urlSession: urlSession, auth: auth)
 		self.usersAPI = MPAPIUserRepository(session: self.session)
 		self.authAPI = MPAPIAuthRepository(session: self.session)
-		self.placemarksAPI = MPAPIPlacemarkRepository(session: self.session)
+		self.placesAPI = MPAPIPlaceRepository(session: self.session)
 	}
 
 	// TODO: Cancel ongoing requests in APIs?

Sources/MonkiProjectsAPIClient/Protocols/WebPlacemarksRepository.swift

@@ -0,0 +1,47 @@
+//
+//  WebPlacesRepository.swift
+//  MonkiProjectsAPIClient
+//
+//  Created by Rémi Bardon on 01/06/2021.
+//  Copyright © 2021 Monki Projects. All rights reserved.
+//
+
+import Foundation
+import Combine
+import Networking
+import MonkiProjectsModel
+import MonkiMapModel
+
+public protocol WebPlacesRepository: AnyObject, WebAPI {
+	
+	// MARK: - Combine Publishers
+	
+	func listPlaces(
+		state: Place.State?,
+		page: PageRequest?
+	) -> AnyPublisher<Page<Place.Public>, Error>
+	
+	// MARK: - Swift async/await
+	
+	@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+	func listPlaces(
+		state: Place.State?,
+		page: PageRequest?
+	) async throws -> Page<Place.Public>
+	
+}
+
+// MARK: - Functions with default parameters
+
+extension WebPlacesRepository {
+	
+	public func listPlaces() -> AnyPublisher<Page<Place.Public>, Error> {
+		return self.listPlaces(state: nil, page: nil)
+	}
+	
+	@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
+	public func listPlaces() async throws -> Page<Place.Public> {
+		return try await self.listPlaces(state: nil, page: nil)
+	}
+	
+}