Merge pull request #122 from wmde/publicrecord

Use publicRecord instead of name field for comment user name display
wmde · Feb 8, 2016 · 52522d9 · 52522d9
2 parents 33690e8 + f2bfae5
commit 52522d9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/src/DataAccess/DbalCommentRepository.php b/src/DataAccess/DbalCommentRepository.php
@@ -32,7 +32,7 @@ public function getPublicComments( int $limit ): array {
 		return array_map(
 			function( Donation $donation ) {
 				return Comment::newInstance()
-					->setAuthorName( $donation->getName() )
+					->setAuthorName( $donation->getPublicRecord() )
 					->setCommentText( $donation->getComment() )
 					->setDonationAmount( (float)$donation->getAmount() )
 					->setPostingTime( $donation->getDtNew() )

diff --git a/tests/Integration/DataAccess/DbalCommentRepositoryTest.php b/tests/Integration/DataAccess/DbalCommentRepositoryTest.php
@@ -114,7 +114,7 @@ public function testOnlyNonDeletedCommentsGetReturned() {
 
 	private function persistFirstComment() {
 		$firstDonation = new Donation();
-		$firstDonation->setName( 'First name' );
+		$firstDonation->setPublicRecord( 'First name' );
 		$firstDonation->setComment( 'First comment' );
 		$firstDonation->setAmount( '100' );
 		$firstDonation->setDtNew( new DateTime( '1984-01-01' ) );
@@ -124,7 +124,7 @@ private function persistFirstComment() {
 
 	private function persistSecondComment() {
 		$secondDonation = new Donation();
-		$secondDonation->setName( 'Second name' );
+		$secondDonation->setPublicRecord( 'Second name' );
 		$secondDonation->setComment( 'Second comment' );
 		$secondDonation->setAmount( '200' );
 		$secondDonation->setDtNew( new DateTime( '1984-02-02' ) );
@@ -134,7 +134,7 @@ private function persistSecondComment() {
 
 	private function persistThirdComment() {
 		$thirdDonation = new Donation();
-		$thirdDonation->setName( 'Third name' );
+		$thirdDonation->setPublicRecord( 'Third name' );
 		$thirdDonation->setComment( 'Third comment' );
 		$thirdDonation->setAmount( '300' );
 		$thirdDonation->setDtNew( new DateTime( '1984-03-03' ) );
@@ -144,7 +144,7 @@ private function persistThirdComment() {
 
 	private function persistPrivateComment() {
 		$privateDonation = new Donation();
-		$privateDonation->setName( 'Private name' );
+		$privateDonation->setPublicRecord( 'Private name' );
 		$privateDonation->setComment( 'Private comment' );
 		$privateDonation->setAmount( '1337' );
 		$privateDonation->setDtNew( new DateTime( '1984-12-12' ) );
@@ -154,7 +154,7 @@ private function persistPrivateComment() {
 
 	private function persistDeletedComment() {
 		$deletedDonation = new Donation();
-		$deletedDonation->setName( 'Deleted name' );
+		$deletedDonation->setPublicRecord( 'Deleted name' );
 		$deletedDonation->setComment( 'Deleted comment' );
 		$deletedDonation->setAmount( '31337' );
 		$deletedDonation->setDtNew( new DateTime( '1984-11-11' ) );

diff --git a/tests/System/Routes/ListCommentsHtmlRouteTest.php b/tests/System/Routes/ListCommentsHtmlRouteTest.php
@@ -51,7 +51,7 @@ private function newClientWithThreeComments(): Client {
 
 	private function persistFirstComment( EntityManager $entityManager ) {
 		$firstDonation = new Donation();
-		$firstDonation->setName( 'First name' );
+		$firstDonation->setPublicRecord( 'First name' );
 		$firstDonation->setComment( 'First comment' );
 		$firstDonation->setAmount( '100.42' );
 		$firstDonation->setDtNew( new DateTime( '1984-01-01' ) );
@@ -61,7 +61,7 @@ private function persistFirstComment( EntityManager $entityManager ) {
 
 	private function persistSecondComment( EntityManager $entityManager ) {
 		$secondDonation = new Donation();
-		$secondDonation->setName( 'Second name' );
+		$secondDonation->setPublicRecord( 'Second name' );
 		$secondDonation->setComment( 'Second comment' );
 		$secondDonation->setAmount( '9001' );
 		$secondDonation->setDtNew( new DateTime( '1984-02-02' ) );
@@ -71,7 +71,7 @@ private function persistSecondComment( EntityManager $entityManager ) {
 
 	private function persistEvilComment( EntityManager $entityManager ) {
 		$secondDonation = new Donation();
-		$secondDonation->setName( 'Third name & company' );
+		$secondDonation->setPublicRecord( 'Third name & company' );
 		$secondDonation->setComment( 'Third <script> comment' );
 		$secondDonation->setAmount( '9001' );
 		$secondDonation->setDtNew( new DateTime( '1984-02-02' ) );

diff --git a/tests/System/Routes/ListCommentsJsonRouteTest.php b/tests/System/Routes/ListCommentsJsonRouteTest.php
@@ -63,7 +63,7 @@ public function testRouteShowsComments() {
 
 	private function persistFirstComment( EntityManager $entityManager ) {
 		$firstDonation = new Donation();
-		$firstDonation->setName( 'First name' );
+		$firstDonation->setPublicRecord( 'First name' );
 		$firstDonation->setComment( 'First comment' );
 		$firstDonation->setAmount( '100' );
 		$firstDonation->setDtNew( new DateTime( '1984-01-01' ) );
@@ -73,7 +73,7 @@ private function persistFirstComment( EntityManager $entityManager ) {
 
 	private function persistSecondComment( EntityManager $entityManager ) {
 		$secondDonation = new Donation();
-		$secondDonation->setName( 'Second name' );
+		$secondDonation->setPublicRecord( 'Second name' );
 		$secondDonation->setComment( 'Second comment' );
 		$secondDonation->setAmount( '200' );
 		$secondDonation->setDtNew( new DateTime( '1984-02-02' ) );

diff --git a/tests/System/Routes/ListCommentsRssRouteTest.php b/tests/System/Routes/ListCommentsRssRouteTest.php
@@ -74,7 +74,7 @@ public function testWhenAreComments_theyAreInTheRss() {
 
 	private function persistFirstComment( EntityManager $entityManager ) {
 		$firstDonation = new Donation();
-		$firstDonation->setName( 'First name' );
+		$firstDonation->setPublicRecord( 'First name' );
 		$firstDonation->setComment( 'First comment' );
 		$firstDonation->setAmount( '100.42' );
 		$firstDonation->setDtNew( new DateTime( '1984-01-01' ) );
@@ -84,7 +84,7 @@ private function persistFirstComment( EntityManager $entityManager ) {
 
 	private function persistSecondComment( EntityManager $entityManager ) {
 		$secondDonation = new Donation();
-		$secondDonation->setName( 'Second name' );
+		$secondDonation->setPublicRecord( 'Second name' );
 		$secondDonation->setComment( 'Second comment' );
 		$secondDonation->setAmount( '9001' );
 		$secondDonation->setDtNew( new DateTime( '1984-02-02' ) );
@@ -94,7 +94,7 @@ private function persistSecondComment( EntityManager $entityManager ) {
 
 	private function persistEvilComment( EntityManager $entityManager ) {
 		$secondDonation = new Donation();
-		$secondDonation->setName( 'Third name & company' );
+		$secondDonation->setPublicRecord( 'Third name & company' );
 		$secondDonation->setComment( 'Third <script> comment' );
 		$secondDonation->setAmount( '9001' );
 		$secondDonation->setDtNew( new DateTime( '1984-02-02' ) );