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

feat: impl input invitation code #1016

Merged
merged 3 commits into from
Nov 22, 2023
Merged

feat: impl input invitation code #1016

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
ff5eec3
feat: 🎸 generate invitation code
tomokisun Nov 22, 2023
8e7eb4b
feat: 🎸 impl input invitation code
tomokisun Nov 22, 2023
ac79070
feat: 🎸 one time code
tomokisun Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions GraphQL/schema.graphqls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@ input CreateUserHideInput {
}

input CreateUserInput {
"""招待コード"""
invitationCode: String

"""招待したユーザーのID"""
inviterUserId: String

Expand Down
8 changes: 8 additions & 0 deletions Packages/DependencyPackage/Sources/God/Schema/InputObjects/CreateUserInput.graphql.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,23 @@ public extension God {
}

public init(
invitationCode: GraphQLNullable<String> = nil,
inviterUserId: GraphQLNullable<String> = nil,
phoneNumber: PhoneNumberInput
) {
__data = InputDict([
"invitationCode": invitationCode,
"inviterUserId": inviterUserId,
"phoneNumber": phoneNumber
])
}

/// 招待コード
public var invitationCode: GraphQLNullable<String> {
get { __data["invitationCode"] }
set { __data["invitationCode"] = newValue }
}

/// 招待したユーザーのID
public var inviterUserId: GraphQLNullable<String> {
get { __data["inviterUserId"] }
Expand Down
7 changes: 6 additions & 1 deletion Packages/GodPackage/Sources/OnboardFeature/OnboardPathLogic.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,12 @@ public struct OnboardPathLogic {

case .phoneNumber(.delegate(.nextScreen)):
state.path.append(
.oneTimeCode(.init(inviterUserId: state.inviterUserId))
.oneTimeCode(
OneTimeCodeLogic.State(
inviterUserId: state.inviterUserId,
invitationCode: state.invitationCode
)
)
)
return .none

Expand Down
10 changes: 7 additions & 3 deletions Packages/GodPackage/Sources/OnboardFeature/OneTimeCode.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,17 @@ import UserDefaultsClient
@Reducer
public struct OneTimeCodeLogic {
public struct State: Equatable {
var inviterUserId: String?
let inviterUserId: String?
let invitationCode: String?
var phoneNumber = ""
var isDisabled = true
var isActivityIndicatorVisible = false
@BindingState var oneTimeCode = ""
@PresentationState var alert: AlertState<Action.Alert>?

public init(inviterUserId: String?) {
public init(inviterUserId: String?, invitationCode: String?) {
self.inviterUserId = inviterUserId
self.invitationCode = invitationCode
}
}

Expand Down Expand Up @@ -127,6 +129,7 @@ public struct OneTimeCodeLogic {
numbers: format.replacing("+81", with: "")
)
let input = God.CreateUserInput(
invitationCode: state.invitationCode ?? .null,
inviterUserId: state.inviterUserId ?? .null,
phoneNumber: phoneNumber
)
Expand Down Expand Up @@ -225,7 +228,8 @@ public struct OneTimeCodeView: View {
OneTimeCodeView(
store: .init(
initialState: OneTimeCodeLogic.State(
inviterUserId: nil
inviterUserId: nil,
invitationCode: nil
),
reducer: { OneTimeCodeLogic() }
)
Expand Down