Skip to content

Commit eef2089

Browse files
Release v7.7.6 (#502)
* Update pom.xml * Bump org.apache.tomcat.embed:tomcat-embed-jasper from 11.0.11 to 11.0.12 (#501) Bumps org.apache.tomcat.embed:tomcat-embed-jasper from 11.0.11 to 11.0.12. --- updated-dependencies: - dependency-name: org.apache.tomcat.embed:tomcat-embed-jasper dependency-version: 11.0.12 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.jacoco:jacoco-maven-plugin from 0.8.13 to 0.8.14 (#500) Bumps [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.13 to 0.8.14. - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](jacoco/jacoco@v0.8.13...v0.8.14) --- updated-dependencies: - dependency-name: org.jacoco:jacoco-maven-plugin dependency-version: 0.8.14 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump software.amazon.awssdk:aws-sdk-java from 2.35.0 to 2.35.5 (#499) Bumps software.amazon.awssdk:aws-sdk-java from 2.35.0 to 2.35.5. --- updated-dependencies: - dependency-name: software.amazon.awssdk:aws-sdk-java dependency-version: 2.35.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * #497 Create 'charityOptionByName' graphQL query (#503) * #497 Create 'charityOptionByName' graphQL query * Update package.json * Update package-lock.json * Update README.md & minor refactoring, separate donate items JSON in src/main/resources & src/test/resources * Update README.md * Revert "Update README.md" This reverts commit 80d0e37. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 2d805d2 commit eef2089

11 files changed

Lines changed: 326 additions & 67 deletions

File tree

README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,17 @@ Personal website / portfolio [https://www.ironoc.net/](https://www.ironoc.net/)
3333
## Tech Stack
3434
Java 21 (LTS), Spring Boot 3.4, ReactJs 18, Maven 3.8 or later, HTML5+CSS,
3535
Docker / Bash, AWS, minikube, & kubectl.
36+
##### Note: `iRonoc` is an active user of the `GitHub API` & `conorheffron` is a proud participant in the GitHub Developer Program.
37+
- The `iRonoc` PM tool is designed to streamline project management by automating project navigation & issue tracking.
38+
- By leveraging the GitHub API, the aim is to enhance the developer experience and contribute to the vibrant GitHub ecosystem.
39+
- As part of the GitHub Developer Program, it is important to commit to adhering to best practices & continuously improving the
40+
integration to provide value to users.
41+
42+
<a href="https://docs.github.com/en/get-started/exploring-integrations/github-developer-program">
43+
<div style="text-align:center">
44+
<img src="./screen-grabs/github-mark.png"/>
45+
</div>
46+
</a>
3647

3748
## See ironoc-frontend README [here](./frontend/README.md)
3849

frontend/package-lock.json

Lines changed: 46 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@conorheffron/ironoc-frontend",
3-
"version": "7.7.5",
3+
"version": "7.7.6",
44
"private": false,
55
"license": "GPL-3.0-or-later",
66
"dependencies": {

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>conorheffron</groupId>
77
<artifactId>ironoc</artifactId>
8-
<version>7.7.5</version>
8+
<version>7.7.6</version>
99
<packaging>war</packaging>
1010

1111
<distributionManagement>
@@ -196,7 +196,7 @@
196196
<dependency>
197197
<groupId>org.apache.tomcat.embed</groupId>
198198
<artifactId>tomcat-embed-jasper</artifactId>
199-
<version>11.0.11</version>
199+
<version>11.0.12</version>
200200
</dependency>
201201
<!-- Unit/integration tests -->
202202
<dependency>
@@ -269,7 +269,7 @@
269269
<dependency>
270270
<groupId>software.amazon.awssdk</groupId>
271271
<artifactId>aws-sdk-java</artifactId>
272-
<version>2.35.0</version>
272+
<version>2.35.5</version>
273273
<exclusions>
274274
<exclusion>
275275
<groupId>commons-logging</groupId>
@@ -385,7 +385,7 @@
385385
<plugin>
386386
<groupId>org.jacoco</groupId>
387387
<artifactId>jacoco-maven-plugin</artifactId>
388-
<version>0.8.13</version>
388+
<version>0.8.14</version>
389389
<executions>
390390
<execution>
391391
<id>prepare-agent</id>

screen-grabs/github-mark.png

6.24 KB
Loading

src/main/java/net/ironoc/portfolio/controller/DonateGraphqlController.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,18 @@ public Donate charityOptionByDonateLink(@Argument("link") String donateLink) {
6969
return donateOptional.orElseGet(() -> Donate.builder().build());
7070
}
7171

72+
@QueryMapping
73+
public Donate charityOptionByName(@Argument("name") String name) {
74+
List<Map<String, Object>> donateItems = donateItemsResolver.getDonateItems();
75+
List<Donate> charityOptions = mapDonateItemsToCharityOptions(donateItems);
76+
77+
Optional<Donate> donateOptional = charityOptions.stream()
78+
.filter(donate -> name.equalsIgnoreCase(donate.getName()))
79+
.findFirst();
80+
81+
return donateOptional.orElseGet(() -> Donate.builder().build());
82+
}
83+
7284
@SchemaMapping
7385
public List<Donate> charityOptions(Donate donateArg) {
7486
List<Map<String, Object>> donateItems = donateItemsResolver.getDonateItems();

src/main/java/net/ironoc/portfolio/graph/DonateItemsResolver.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
@Component
2424
public class DonateItemsResolver extends AbstractLogger implements GraphQLQueryResolver {
2525

26-
protected static final String DONATE_ITEMS_JSON_FILE = "json/donate-items.json";
27-
protected static final String CHARITIES_LIST_FILE = "graphql/charities.txt";
26+
private static final String DONATE_ITEMS_JSON_FILE = "json/donate-items.json";
27+
private static final String CHARITIES_LIST_FILE = "graphql/charities.txt";
2828

2929
// In-memory list to store donate items as POJOs
30-
protected final List<Donate> donateItems = new ArrayList<>();
30+
private final List<Donate> donateItems = new ArrayList<>();
3131

3232
// In-memory set to store allowed charity names
3333
protected final Set<String> allowedCharityNames = new HashSet<>();

src/main/resources/graphql/ironocGraphSchema.graphql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ type Query {
3333
donateItemsByCountAndOffset(count: Int, offset: Int): [DonateItem]!
3434
charityOptionByFounded(founded: Int): DonateItem!
3535
charityOptionByDonateLink(link: String): DonateItem!
36+
charityOptionByName(name: String): DonateItem!
3637
}
3738

3839
type Mutation {

src/main/resources/json/donate-items.json

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,5 +118,95 @@
118118
"overview": "WE CREATE LASTING, POSITIVE CHANGE FOR AND WITH CHILDREN. Save the Children is the world’s first and leading independent children’s organisation transforming lives and the future we share. We’re proud to work with children, their communities, and our partners worldwide, discovering new solutions to help ensure that the world's most vulnerable children survive, learn and are protected. Every year, we reach tens of millions of children in more than 110 countries through our life-changing work.",
119119
"founded": 1919,
120120
"phone": "+44 (0)20 7012 6400"
121+
},
122+
{
123+
"donate": "https://alone.ie/donate/",
124+
"link": "https://alone.ie/",
125+
"img": "red",
126+
"alt": "red28",
127+
"name": "ALONE",
128+
"overview": "ALONE is a national charity organization in Ireland dedicated to empowering older people to age comfortably and securely in their own homes while remaining connected to their communities. They provide compassionate and confidential support for seniors dealing with issues such as anxiety, dementia, and loneliness. Their mission is to improve the physical, emotional, and mental well-being of older people, ensuring they can age happily and securely at home.",
129+
"founded": 1977,
130+
"phone": "0818 222 024"
131+
},
132+
{
133+
"donate": "https://www.barnardos.ie/donate/donation/index.html",
134+
"link": "https://www.barnardos.ie/",
135+
"img": "red",
136+
"alt": "red27",
137+
"name": "Barnardos Ireland",
138+
"overview": "Barnardos is a leading children's charity in Ireland dedicated to supporting vulnerable children and families through various services and programs. Barnardos operates as a registered charity in the Republic of Ireland, focusing on protecting and supporting children and young people who are in need. The organization was founded by Dr. Thomas Barnardo, initially in London, but has since expanded its mission to Ireland. Today, Barnardos is committed to transforming the lives of vulnerable children affected by adverse childhood experiences.",
139+
"founded": 1866,
140+
"phone": "01 453 0355"
141+
},
142+
{
143+
"donate": "https://www.trocaire.org/donations/now/",
144+
"link": "https://www.trocaire.org/",
145+
"img": "red",
146+
"alt": "red26",
147+
"name": "Trócaire",
148+
"overview": "Trócaire is the official overseas development agency of the Catholic Church in Ireland, to support the world's poorest and most oppressed people. It works with parishes and communities across Ireland to promote global justice and inspire action. Trócaire is also known as Caritas Ireland, reflecting its mission of mercy and support for those in need. For more information, you can visit their official website.",
149+
"founded": 1973,
150+
"phone": "01 629 3333"
151+
},
152+
{
153+
"donate": "https://www.sightsavers.ie/donate",
154+
"link": "https://www.sightsavers.ie/",
155+
"img": "red",
156+
"alt": "red25",
157+
"name": "Sightsavers",
158+
"overview": "Sightsavers Ireland is an international organization dedicated to eliminating avoidable blindness and promoting equality for people with disabilities. They work in over 30 countries in Africa and Asia, training health workers, providing eye operations, and improving women's health. The Irish team is based in Dublin, focusing on fundraising, communications, and public engagement. Their vision is a world where no one is blind from avoidable causes, and where everyone can participate equally in society. For more information, you can visit their official website.",
159+
"founded": 1950,
160+
"phone": "01 663 7666"
161+
},
162+
{
163+
"donate": "https://ocf.ie/make-a-donation/",
164+
"link": "https://ocf.ie/",
165+
"img": "red",
166+
"alt": "red24",
167+
"name": "Oesophageal Cancer Fund",
168+
"overview": "The Oesophageal Cancer Fund (OCF) is the national charity for oesophageal cancer in Ireland, dedicated to providing support, raising awareness, and funding research for this disease. The OCF aims to ensure that everyone affected by oesophageal cancer receives the earliest and best support and treatment possible. The organization is composed of volunteers, medical professionals, researchers, patients, and survivors, all working together to help those impacted by this challenging condition.",
169+
"founded": 2001,
170+
"phone": "+353 86 069 7328"
171+
},
172+
{
173+
"donate": "https://donate.mylovelyhorserescue.com/one-off/",
174+
"link": "https://www.mylovelyhorserescue.com/",
175+
"img": "red",
176+
"alt": "red23",
177+
"name": "My Lovely Horse Animal Rescue",
178+
"overview": "My Lovely Horse Animal Rescue is an animal welfare organisation that rescues, rehabilitate and rehomes unwanted, neglected and abused animals with the aim of giving them a life worth living.",
179+
"founded": 2011,
180+
"phone": "+353 1 607 2379"
181+
},
182+
{
183+
"donate": "https://www.rmhc.ie/donate-make-a-payment",
184+
"link": "https://www.rmhc.ie/",
185+
"img": "red",
186+
"alt": "red22",
187+
"name": "Ronald McDonald House Charities",
188+
"overview": "Keeping families close, is what matters most. The mission of Ronald McDonald House Charities Ireland is to provide a Ronald McDonald House to support families whose children are seriously ill in hospital. The Ronald McDonald House provides accommodation and a caring and supportive environment for families whose children are seriously ill and are hospitalised or undergoing medical treatment at Children’s Health Ireland, Crumlin.",
189+
"founded": 1974,
190+
"phone": "(01) 456 0435"
191+
},
192+
{
193+
"donate": "https://irishheart.ie/ways-to-give/",
194+
"link": "https://irishheart.ie/",
195+
"img": "red",
196+
"alt": "red21",
197+
"name": "The Irish Heart Foundation",
198+
"overview": "Every hour, someone in Ireland suffers from a stroke. Every day, hundreds of people in Ireland are diagnosed with cardiovascular disease. Lives are often cut tragically short and many are left disabled. Each year almost 9,000 people die from heart disease and stroke, one of the country’s biggest killers. It doesn’t have to be this way, and our vision is for a future where no hearts are broken by preventable heart disease and stroke. This is why the Irish Heart Foundation was formed as the national stroke and heart charity, we work every day to save lives and heal hearts. Our mission is to eliminate preventable death and disability from heart disease and stroke and to support and care for those living with these life-changing conditions.",
199+
"founded": 1966,
200+
"phone": "+353 1 6685001"
201+
},
202+
{
203+
"donate": "https://mariekeating.ie/donate/",
204+
"link": "https://mariekeating.ie/home/",
205+
"img": "red",
206+
"alt": "red20",
207+
"name": "Marie Keating Foundation",
208+
"overview": "The Marie Keating Foundation is an ever-growing family of people that care. Just like our supporters, we care about compassion. We care about dignity. We care about humanity. We care about people. We care passionately about giving people the information and support they need, from raising awareness about early detection to the moment of diagnosis and beyond. We believe that a community of people who care and work together can change things for the better and build a world free from the fear of cancer.",
209+
"founded": 2001,
210+
"phone": "01 628 3726"
121211
}
122212
]

0 commit comments

Comments
 (0)