Skip to content

Commit 6ea5c3d

Browse files
BagurpBagurp
committed
Merge branch 'develop' of https://github.com/oci-labs/check-ins into issue_13_update_readme
2 parents 23c57ce + ab03bd6 commit 6ea5c3d

File tree

6 files changed

+182
-5
lines changed

6 files changed

+182
-5
lines changed

‎server/src/main/java/com/objectcomputing/checkins/services/checkins/CheckIns.java

+88
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
package com.objectcomputing.checkins.services.checkins;
2+
3+
import java.sql.Date;
4+
import java.util.UUID;
5+
6+
import javax.persistence.Column;
7+
import javax.persistence.Entity;
8+
import javax.persistence.GeneratedValue;
9+
import javax.persistence.Id;
10+
import javax.persistence.Table;
11+
import javax.validation.constraints.NotNull;
12+
13+
@Entity
14+
@Table(name="checkins")
15+
public class CheckIns {
16+
17+
public CheckIns() {}
18+
19+
public CheckIns(UUID teamMemberId, UUID pdlId, Date checkInDate, String targetQtr, String targetYear) {
20+
this.teamMemberId= teamMemberId;
21+
this.pdlId=pdlId;
22+
this.checkInDate=checkInDate;
23+
this.targetQtr=targetQtr;
24+
this.targetYear=targetYear;
25+
}
26+
27+
@Column(name="teamMemberId")
28+
@NotNull
29+
private UUID teamMemberId;
30+
31+
32+
@Id
33+
@Column(name="uuid")
34+
@NotNull
35+
@GeneratedValue
36+
private UUID pdlId;
37+
38+
@Column(name="checkindate")
39+
private Date checkInDate;
40+
41+
@Column(name="targetqtr")
42+
private String targetQtr;
43+
44+
@Column(name="targetyear")
45+
private String targetYear;
46+
47+
48+
public UUID getTeamMemberId() {
49+
return this.teamMemberId;
50+
}
51+
52+
public void setTeamMemberId(UUID teamMemberId) {
53+
this.teamMemberId = teamMemberId;
54+
}
55+
56+
public UUID getPdlId() {
57+
return this.pdlId;
58+
}
59+
60+
public void setPdlId(UUID pdlId) {
61+
this.pdlId = pdlId;
62+
}
63+
64+
public Date getCheckInDate() {
65+
return this.checkInDate;
66+
}
67+
68+
public void setCheckInDate(Date checkInDate) {
69+
this.checkInDate = checkInDate;
70+
}
71+
72+
public String getTargetQtr() {
73+
return this.targetQtr;
74+
}
75+
76+
public void setTargetQtr(String targetQtr) {
77+
this.targetQtr = targetQtr;
78+
}
79+
80+
public String getTargetYear() {
81+
return this.targetYear;
82+
}
83+
84+
public void setTargetYear(String targetYear) {
85+
this.targetYear = targetYear;
86+
}
87+
88+
}

‎server/src/main/java/com/objectcomputing/checkins/services/checkins/CheckInsController.java

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
package com.objectcomputing.checkins.services.checkins;
2+
3+
import java.net.URI;
4+
import java.util.List;
5+
import java.util.UUID;
6+
7+
import javax.annotation.Nullable;
8+
import javax.validation.Valid;
9+
10+
import com.objectcomputing.checkins.services.checkins.CheckIns;
11+
12+
import io.micronaut.http.HttpResponse;
13+
import io.micronaut.http.annotation.Body;
14+
import io.micronaut.http.annotation.Controller;
15+
import io.micronaut.http.annotation.Get;
16+
import io.micronaut.http.annotation.Post;
17+
import io.micronaut.http.annotation.Put;
18+
19+
@Controller("/check-in")
20+
public class CheckInsController {
21+
22+
protected final CheckInsRepository checkInsRepository;
23+
24+
public CheckInsController(CheckInsRepository checkInsRepository){
25+
this.checkInsRepository = checkInsRepository;
26+
}
27+
28+
@Get("/{?teamMemberId,targetYear,targetQtr,pdlId}")
29+
public List<CheckIns> findByValue(@Nullable UUID teamMemberId, @Nullable String targetYear, @Nullable UUID pdlId
30+
,@Nullable String targetQtr) {
31+
32+
if(teamMemberId != null) {
33+
return checkInsRepository.findByName(teamMemberId);
34+
} else if(targetYear != null) {
35+
return checkInsRepository.findByTargetQuarter(targetYear,targetQtr);
36+
} else if(pdlId != null) {
37+
return checkInsRepository.findByPdlId(pdlId);
38+
} else {
39+
return checkInsRepository.findAll();
40+
}
41+
}
42+
43+
44+
@Post("/")
45+
public HttpResponse<CheckIns> save(@Body @Valid CheckIns checkIns) {
46+
CheckIns newMemberCheckIn = checkInsRepository.save(checkIns);
47+
48+
return HttpResponse.created(newMemberCheckIn)
49+
.headers(headers -> headers.location(location(newMemberCheckIn.getPdlId())));
50+
}
51+
52+
53+
@Put("/")
54+
public HttpResponse<?> update(@Body @Valid CheckIns checkIn) {
55+
56+
if(null != checkIn.getTeamMemberId()){
57+
CheckIns updatedMemberCheckIn = checkInsRepository.update(checkIn);
58+
return HttpResponse
59+
.ok()
60+
.headers(headers -> headers.location(location(updatedMemberCheckIn.getTeamMemberId())))
61+
.body(updatedMemberCheckIn);
62+
63+
}
64+
65+
return HttpResponse.badRequest();
66+
}
67+
68+
private URI location(UUID pdlId) {
69+
return URI.create("/check-in/" + pdlId);
70+
}
71+
72+
}

‎server/src/main/java/com/objectcomputing/checkins/services/checkins/CheckInsRepository.java

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package com.objectcomputing.checkins.services.checkins;
2+
3+
import java.util.List;
4+
import java.util.UUID;
5+
6+
import com.objectcomputing.checkins.services.checkins.CheckIns;
7+
8+
import io.micronaut.data.repository.CrudRepository;
9+
10+
public interface CheckInsRepository extends CrudRepository<CheckIns,UUID>{
11+
12+
List<CheckIns> findByName(UUID teamMemberId);
13+
List<CheckIns> findByPdlId(UUID pdlId);
14+
List<CheckIns> findByTargetQuarter(String targetYear,String targetQtr);
15+
List<CheckIns> findAll();
16+
17+
}

‎server/src/main/java/com/objectcomputing/checkins/member/MemberProfile.java renamed to ‎server/src/main/java/com/objectcomputing/checkins/services/memberprofile/MemberProfile.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.objectcomputing.checkins.member;
1+
package com.objectcomputing.checkins.services.memberprofile;
22

33
import java.sql.Date;
44
import java.util.UUID;

‎server/src/main/java/com/objectcomputing/checkins/MemberProfileController.java renamed to ‎server/src/main/java/com/objectcomputing/checkins/services/memberprofile/MemberProfileController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.objectcomputing.checkins;
1+
package com.objectcomputing.checkins.services.memberprofile;
22

33
import java.net.URI;
44
import java.util.List;
@@ -7,7 +7,7 @@
77
import javax.annotation.Nullable;
88
import javax.validation.Valid;
99

10-
import com.objectcomputing.checkins.member.MemberProfile;
10+
import com.objectcomputing.checkins.services.memberprofile.MemberProfile;
1111

1212
import io.micronaut.http.HttpResponse;
1313
import io.micronaut.http.annotation.Body;

‎server/src/main/java/com/objectcomputing/checkins/MemberProfileRepository.java renamed to ‎server/src/main/java/com/objectcomputing/checkins/services/memberprofile/MemberProfileRepository.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.objectcomputing.checkins;
1+
package com.objectcomputing.checkins.services.memberprofile;
22

33
import java.util.List;
44
import java.util.UUID;
55

6-
import com.objectcomputing.checkins.member.MemberProfile;
6+
import com.objectcomputing.checkins.services.memberprofile.MemberProfile;
77

88
import io.micronaut.data.repository.CrudRepository;
99

0 commit comments

Comments
 (0)