Skip to content

Commit 15a4ed3

Browse files
Barry-ZouBarry-Zou
committed
Refactor integration test
1 parent 8160511 commit 15a4ed3

File tree

1 file changed

+109
-52
lines changed

1 file changed

+109
-52
lines changed

‎src/test/java/com/squareup/square/integration/LaborTest.java‎

Lines changed: 109 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@
1212
import com.squareup.square.labor.types.SearchShiftsRequest;
1313
import com.squareup.square.labor.types.UpdateBreakTypeRequest;
1414
import com.squareup.square.labor.types.UpdateShiftRequest;
15+
import com.squareup.square.types.Location;
16+
import com.squareup.square.types.SearchTeamMembersRequest;
17+
import com.squareup.square.types.SearchTeamMembersQuery;
18+
import com.squareup.square.types.SearchTeamMembersFilter;
19+
import com.squareup.square.types.TeamMemberStatus;
1520
import com.squareup.square.types.BreakType;
1621
import com.squareup.square.types.CreateBreakTypeResponse;
1722
import com.squareup.square.types.CreateShiftResponse;
18-
import com.squareup.square.types.CreateTeamMemberRequest;
19-
import com.squareup.square.types.CreateTeamMemberResponse;
2023
import com.squareup.square.types.DeleteBreakTypeResponse;
2124
import com.squareup.square.types.DeleteShiftResponse;
2225
import com.squareup.square.types.GetBreakTypeResponse;
@@ -28,8 +31,11 @@
2831
import com.squareup.square.types.UpdateBreakTypeResponse;
2932
import com.squareup.square.types.UpdateShiftResponse;
3033
import com.squareup.square.types.WorkweekConfig;
34+
3135
import java.time.OffsetDateTime;
3236
import java.time.format.DateTimeFormatter;
37+
import java.util.Collections;
38+
import java.util.List;
3339
import java.util.Optional;
3440
import java.util.UUID;
3541
import org.junit.jupiter.api.AfterEach;
@@ -47,21 +53,32 @@ public class LaborTest {
4753
@BeforeEach
4854
public void before() {
4955
client = TestClientFactory.create();
50-
locationId = Helpers.createLocation(client);
51-
52-
// Create team member for testing
53-
CreateTeamMemberResponse teamResponse = client.teamMembers()
54-
.create(CreateTeamMemberRequest.builder()
55-
.idempotencyKey(UUID.randomUUID().toString())
56-
.teamMember(TeamMember.builder()
57-
.givenName("Sherlock")
58-
.familyName("Holmes")
59-
.build())
60-
.build());
61-
if (!teamResponse.getTeamMember().get().getId().isPresent()) {
62-
throw new RuntimeException("Failed to create team member.");
56+
57+
// Get first available location
58+
List<Location> locations = client.locations().list().getLocations()
59+
.orElseThrow(() -> new RuntimeException("No locations available"));
60+
if (locations.isEmpty()) {
61+
throw new RuntimeException("No locations available for testing");
6362
}
64-
memberId = teamResponse.getTeamMember().get().getId().get();
63+
locationId = locations.get(0).getId().orElseThrow(() -> new RuntimeException("Location ID not present"));
64+
65+
// Get first available team member at this location
66+
List<TeamMember> teamMembers = client.teamMembers().search(
67+
SearchTeamMembersRequest.builder()
68+
.query(SearchTeamMembersQuery.builder()
69+
.filter(SearchTeamMembersFilter.builder()
70+
.locationIds(Collections.singletonList(locationId))
71+
.status(TeamMemberStatus.ACTIVE)
72+
.build())
73+
.build())
74+
.build()
75+
).getTeamMembers()
76+
.orElseThrow(() -> new RuntimeException("Failed to get team members"));
77+
78+
if (teamMembers.isEmpty()) {
79+
throw new RuntimeException("No team members available at location " + locationId);
80+
}
81+
memberId = teamMembers.get(0).getId().orElseThrow(() -> new RuntimeException("Team member ID not present"));
6582

6683
// Create break type for testing
6784
CreateBreakTypeResponse breakResponse = client.labor()
@@ -209,46 +226,86 @@ public void testUpdateShift() {
209226
}
210227

211228
@Test
212-
public void testDeleteShift() {
213-
// create team member
214-
CreateTeamMemberResponse teamMemberResponse = client.teamMembers()
215-
.create(CreateTeamMemberRequest.builder()
216-
.idempotencyKey(UUID.randomUUID().toString())
217-
.teamMember(TeamMember.builder()
218-
.givenName("Sherlock")
219-
.familyName("Holmes")
220-
.build())
221-
.build());
229+
public void testDeleteShift() throws Exception {
230+
try {
231+
// First search for existing shifts for this team member using query filter
232+
SearchShiftsRequest searchRequest = SearchShiftsRequest.builder()
233+
.query(com.squareup.square.types.ShiftQuery.builder()
234+
.filter(com.squareup.square.types.ShiftFilter.builder()
235+
.teamMemberIds(Collections.singletonList(memberId))
236+
.build())
237+
.build())
238+
.limit(100)
239+
.build();
222240

223-
// create shift
224-
CreateShiftResponse shiftResponse = client.labor()
225-
.shifts()
226-
.create(CreateShiftRequest.builder()
227-
.shift(Shift.builder()
228-
.locationId(locationId)
229-
.startAt(OffsetDateTime.now().format(DateTimeFormatter.ISO_INSTANT))
230-
.teamMemberId(
231-
teamMemberResponse.getTeamMember().get().getId())
232-
.build())
233-
.idempotencyKey(UUID.randomUUID().toString())
234-
.build());
241+
SearchShiftsResponse existingShifts = client.labor()
242+
.shifts()
243+
.search(searchRequest);
235244

236-
if (!shiftResponse.getShift().isPresent()) {
237-
throw new RuntimeException("Failed to create shift.");
238-
}
239-
if (!shiftResponse.getShift().get().getId().isPresent()) {
240-
throw new RuntimeException("Shift ID is null.");
245+
// Delete any existing shifts
246+
if (existingShifts.getShifts().isPresent()) {
247+
for (Shift existingShift : existingShifts.getShifts().get()) {
248+
if (existingShift.getId().isPresent()) {
249+
client.labor()
250+
.shifts()
251+
.delete(DeleteShiftsRequest.builder().id(existingShift.getId().get()).build());
252+
System.out.println("Deleted existing shift: " + existingShift.getId().get());
253+
}
254+
}
255+
}
256+
257+
// Start the shift 30 seconds from now (within the 1 minute future limit)
258+
OffsetDateTime startTime = OffsetDateTime.now().plusSeconds(30);
259+
OffsetDateTime endTime = startTime.plusHours(8);
260+
System.out.println("Creating new shift starting at: " + startTime);
261+
262+
// Create shift
263+
CreateShiftResponse shiftResponse = client.labor()
264+
.shifts()
265+
.create(CreateShiftRequest.builder()
266+
.shift(Shift.builder()
267+
.locationId(locationId)
268+
.startAt(startTime.format(DateTimeFormatter.ISO_INSTANT))
269+
.teamMemberId(memberId)
270+
.endAt(endTime.format(DateTimeFormatter.ISO_INSTANT))
271+
.build())
272+
.idempotencyKey(UUID.randomUUID().toString())
273+
.build());
274+
275+
if (!shiftResponse.getShift().isPresent()) {
276+
throw new RuntimeException("Failed to create shift: shift response is empty");
277+
}
278+
279+
Optional<Shift> shift = shiftResponse.getShift();
280+
if (!shift.get().getId().isPresent()) {
281+
throw new RuntimeException("Shift ID is null in response: " + shift);
282+
}
283+
284+
String testShiftId = shift.get().getId().get();
285+
System.out.println("Successfully created shift with ID: " + testShiftId + " starting at " + startTime);
286+
287+
// Add a small delay to ensure the shift is fully created
288+
Thread.sleep(1000);
289+
290+
DeleteShiftResponse response = client.labor()
291+
.shifts()
292+
.delete(DeleteShiftsRequest.builder().id(testShiftId).build());
293+
Assertions.assertNotNull(response);
294+
System.out.println("Successfully deleted shift with ID: " + testShiftId);
295+
296+
} catch (Exception e) {
297+
System.err.println("Test failed with exception: " + e.getMessage());
298+
if (e instanceof com.squareup.square.core.SquareApiException) {
299+
System.err.println("API Error details: " + e.getMessage());
300+
}
301+
e.printStackTrace();
302+
throw e;
241303
}
242-
shiftId = shiftResponse.getShift().get().getId().get();
243-
DeleteShiftResponse response = client.labor()
244-
.shifts()
245-
.delete(DeleteShiftsRequest.builder().id(shiftId).build());
246-
Assertions.assertNotNull(response);
247304
}
248305

249306
@Test
250307
public void testDeleteBreakType() {
251-
// create break type
308+
// Create break type
252309
CreateBreakTypeResponse breakResponse = client.labor()
253310
.breakTypes()
254311
.create(CreateBreakTypeRequest.builder()
@@ -268,11 +325,11 @@ public void testDeleteBreakType() {
268325
if (!breakType.get().getId().isPresent()) {
269326
throw new RuntimeException("Break ID is null.");
270327
}
271-
breakId = breakType.get().getId().get();
328+
String testBreakId = breakType.get().getId().get();
272329

273330
DeleteBreakTypeResponse response = client.labor()
274331
.breakTypes()
275-
.delete(DeleteBreakTypesRequest.builder().id(breakId).build());
332+
.delete(DeleteBreakTypesRequest.builder().id(testBreakId).build());
276333
Assertions.assertNotNull(response);
277334
}
278335

@@ -283,4 +340,4 @@ public void testListWorkweekConfigs() {
283340
.list(ListWorkweekConfigsRequest.builder().build());
284341
Assertions.assertFalse(response.getItems().isEmpty());
285342
}
286-
}
343+
}

0 commit comments

Comments
 (0)