Skip to content

Commit d518550

Browse files
anthonydmaysanthonydmays
authored
Merge branch 'main' into DavidSmith-Lesson10-Loader.ts
2 parents 8de7b8c + 86decd1 commit d518550

39 files changed

+7254
-15
lines changed

‎.github/workflows/check_lesson_11_java_pr.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Check Lesson 11 Pull Request
2+
3+
on:
4+
pull_request:
5+
branches: [ "main" ]
6+
paths:
7+
- "lesson_11/arrays_java/**"
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
permissions:
14+
contents: read
15+
16+
steps:
17+
- uses: actions/checkout@v4
18+
19+
- name: Set up JDK 17
20+
uses: actions/setup-java@v4
21+
with:
22+
java-version: '17'
23+
distribution: 'temurin'
24+
25+
- name: Build Lesson 11 with Java
26+
working-directory: ./lesson_11/arrays_java
27+
run: ./gradlew check

‎.github/workflows/check_lesson_11_pr.yaml‎ renamed to ‎.github/workflows/check_lesson_11_ts_pr.yaml‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
name: Check Lesson 10 Pull Request
1+
name: Check Lesson 11 Pull Request
22

33
on:
44
pull_request:
55
branches: [ "main" ]
66
paths:
7-
- "lesson_11/arrays_java/**"
87
- "lesson_11/arrays_ts/**"
98

109
jobs:
@@ -17,21 +16,11 @@ jobs:
1716
steps:
1817
- uses: actions/checkout@v4
1918

20-
- name: Set up JDK 17
21-
uses: actions/setup-java@v4
22-
with:
23-
java-version: '17'
24-
distribution: 'temurin'
25-
2619
- name: Use Node.js
2720
uses: actions/setup-node@v4
2821
with:
2922
node-version: '20.x'
3023

31-
- name: Build Lesson 11 with Java
32-
working-directory: ./lesson_11/arrays_java
33-
run: ./gradlew check
34-
3524
- name: Build Lesson 11 with Node.js
3625
working-directory: ./lesson_11/arrays_ts
3726
run: |

‎.github/workflows/check_lesson_12_java_pr.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Check Lesson 12 Pull Request
2+
3+
on:
4+
pull_request:
5+
branches: [ "main" ]
6+
paths:
7+
- "lesson_12/structs_java/**"
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
permissions:
14+
contents: read
15+
16+
steps:
17+
- uses: actions/checkout@v4
18+
19+
- name: Set up JDK 17
20+
uses: actions/setup-java@v4
21+
with:
22+
java-version: '17'
23+
distribution: 'temurin'
24+
25+
- name: Build Lesson 12 with Java
26+
working-directory: ./lesson_12/structs_java
27+
run: ./gradlew check

‎.github/workflows/check_lesson_12_ts_pr.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Check Lesson 12 Pull Request
2+
3+
on:
4+
pull_request:
5+
branches: [ "main" ]
6+
paths:
7+
- "lesson_12/structs_ts/**"
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
permissions:
14+
contents: read
15+
16+
steps:
17+
- uses: actions/checkout@v4
18+
19+
- name: Use Node.js
20+
uses: actions/setup-node@v4
21+
with:
22+
node-version: '20.x'
23+
24+
- name: Build Lesson 12 with Node.js
25+
working-directory: ./lesson_12/structs_ts
26+
run: |
27+
npm ci
28+
npm run check

‎.github/workflows/check_push.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ on:
1313
- "lesson_10/libraries/**"
1414
- "lesson_11/arrays_java/**"
1515
- "lesson_11/arrays_ts/**"
16+
- "lesson_12/structs_java/**"
17+
- "lesson_12/structs_ts/**"
1618

1719
jobs:
1820
build:
@@ -93,3 +95,13 @@ jobs:
9395
run: |
9496
npm ci
9597
npm run compile
98+
99+
- name: Build Lesson 12 with Java
100+
working-directory: ./lesson_12/structs_java
101+
run: ./gradlew assemble
102+
103+
- name: Build Lesson 12 with Node.js
104+
working-directory: ./lesson_12/structs_ts
105+
run: |
106+
npm ci
107+
npm run compile

‎lesson_09/types/types_app/src/main/java/com/codedifferently/lesson9/dataprovider/ShawnDunsmoreProvider.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package main.java.com.codedifferently.lesson9.dataprovider;
2+
3+
import com.codedifferently.lesson9.dataprovider.DataProvider;
4+
import java.util.Map;
5+
import org.springframework.stereotype.Service;
6+
7+
@Service
8+
public class ShawnDunsmoreProvider extends DataProvider {
9+
public String getProviderName() {
10+
return "shawmdunsmore";
11+
}
12+
13+
public Map<String, Class> getColumnTypeByName() {
14+
return Map.of(
15+
"column1", Float.class,
16+
"column2", Integer.class,
17+
"column3", Float.class,
18+
"column4", Integer.class,
19+
"column5", String.class,
20+
"column6", Integer.class,
21+
"column7", Boolean.class);
22+
}
23+
}

‎lesson_09/types/types_app/src/main/resources/data/shawndunsmore.json‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
[
2+
{
3+
"column1": "2.5975503E38",
4+
"column2": "5664226295930521600",
5+
"column3": "1.9268648586794186E307",
6+
"column4": "13164",
7+
"column5": "ejq4a75",
8+
"column6": "1898846002",
9+
"column7": "false"
10+
},
11+
{
12+
"column1": "2.624149E38",
13+
"column2": "2667905418562562560",
14+
"column3": "9.647265260343374E307",
15+
"column4": "21831",
16+
"column5": "onxzs7",
17+
"column6": "187799466",
18+
"column7": "true"
19+
},
20+
{
21+
"column1": "1.3378175E37",
22+
"column2": "5574344195759352832",
23+
"column3": "1.0553221728595063E308",
24+
"column4": "9593",
25+
"column5": "3k2usm5dt",
26+
"column6": "1440856592",
27+
"column7": "true"
28+
},
29+
{
30+
"column1": "2.1907175E38",
31+
"column2": "6993138911564431360",
32+
"column3": "1.6856102170434321E308",
33+
"column4": "31096",
34+
"column5": "r9sg3ivy",
35+
"column6": "1893363745",
36+
"column7": "false"
37+
},
38+
{
39+
"column1": "1.9505218E38",
40+
"column2": "9025951922004683776",
41+
"column3": "6.396469959388043E307",
42+
"column4": "10920",
43+
"column5": "glwno1z2",
44+
"column6": "226102071",
45+
"column7": "true"
46+
},
47+
{
48+
"column1": "1.6333101E38",
49+
"column2": "5098983408897986560",
50+
"column3": "1.3629475836701135E308",
51+
"column4": "24686",
52+
"column5": "15djl",
53+
"column6": "1455504852",
54+
"column7": "true"
55+
},
56+
{
57+
"column1": "3.5340154E37",
58+
"column2": "6233740675969122304",
59+
"column3": "6.505875808945395E307",
60+
"column4": "17388",
61+
"column5": "bedz8g",
62+
"column6": "472238337",
63+
"column7": "true"
64+
},
65+
{
66+
"column1": "1.6295155E37",
67+
"column2": "7780669253529218048",
68+
"column3": "1.39665841270448E308",
69+
"column4": "2850",
70+
"column5": "842g9bri6ej",
71+
"column6": "1605076333",
72+
"column7": "true"
73+
},
74+
{
75+
"column1": "2.0464422E38",
76+
"column2": "3416033937088187392",
77+
"column3": "7.700196024395798E307",
78+
"column4": "14940",
79+
"column5": "wgcumkqn",
80+
"column6": "1374923365",
81+
"column7": "true"
82+
},
83+
{
84+
"column1": "2.0378536E38",
85+
"column2": "7666386382444016640",
86+
"column3": "9.594346982668915E307",
87+
"column4": "7992",
88+
"column5": "1ysgj",
89+
"column6": "1476248924",
90+
"column7": "false"
91+
}
92+
]

‎lesson_10/libraries/src/loaders/dwight_blue_loader.ts‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
import csv from 'csv-parser';
2+
import fs from 'fs';
3+
import { Credit, MediaItem } from '../models/index.js';
4+
import { Loader } from './loader.js';
5+
6+
export class DwightBlueLoader implements Loader {
7+
getLoaderName(): string {
8+
return 'dwightblue';
9+
}
10+
11+
async loadData(): Promise<MediaItem[]> {
12+
const credits = await this.loadCredits();
13+
const mediaItems = await this.loadMediaItems();
14+
15+
for (let i = 0; i < mediaItems.length; i++) {
16+
mediaItems[i].addCredit(credits[i]);
17+
console.log(mediaItems[i]);
18+
}
19+
20+
console.log(
21+
`Loaded ${credits.length} credits and ${mediaItems.length} media items`,
22+
);
23+
24+
return [...mediaItems.values()];
25+
}
26+
27+
async loadMediaItems(): Promise<MediaItem[]> {
28+
// TODO: Implement this method.
29+
const mediaItem = [];
30+
const readable = fs
31+
.createReadStream('data/media_items.csv', 'utf-8')
32+
.pipe(csv());
33+
for await (const row of readable) {
34+
const { id, title, type, year } = row;
35+
mediaItem.push(new MediaItem(id, title, type, year, []));
36+
}
37+
return mediaItem;
38+
}
39+
40+
async loadCredits(): Promise<Credit[]> {
41+
const credits = [];
42+
const readable = fs
43+
.createReadStream('data/credits.csv', 'utf-8')
44+
.pipe(csv());
45+
for await (const row of readable) {
46+
const { media_item_id: mediaItemId, role, name } = row;
47+
credits.push(new Credit(mediaItemId, name, role));
48+
}
49+
return credits;
50+
}
51+
}

‎lesson_10/libraries/src/loaders/loaders.module.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Module } from '@nestjs/common';
22
import { AngelicaCastilloLoader } from './angelica_castillo_loader.js';
33
import { AnthonyMaysLoader } from './anthony_mays_loader.js';
4-
import { DavidSmithLoader } from './david_smith_loader.js';
4+
import { DwightBlueLoader } from './dwight_blue_loader.js';
55
import { JamesCapparellLoader } from './james_capparell_loader.js';
66
import { NileJacksonLoader } from './nile_jackson_loader.js';
77
import { XavierCruzLoader } from './xavier_cruz_loader.js';
@@ -12,10 +12,11 @@ export const Loaders = Symbol.for('Loaders');
1212
const LOADER_PROVIDERS = [
1313
AnthonyMaysLoader,
1414
AngelicaCastilloLoader,
15+
DavidSmithLoader,
16+
DwightBlueLoader,
1517
JamesCapparellLoader,
1618
NileJacksonLoader,
1719
XavierCruzLoader,
18-
DavidSmithLoader,
1920
];
2021

2122
@Module({

‎lesson_12/README.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,11 @@ Please review the following resources before lecture:
99

1010
## Homework
1111

12-
TODO(anthonydmays): Finish this
12+
- [ ] Implement the `gameResult` method in [Lesson12.java](./structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Lesson12.java).
13+
- [ ] Implement the `Stack` methods in [Stack.java](./structs_java/structs_app/src/main/java/com/codedifferently/lesson12/Stack.java).
14+
- [ ] Submit solutions via PR.
15+
- [ ] Do pre-work for [lesson 13](/lesson_13/).
16+
17+
### Extra credit
18+
19+
- [ ] Complete TypeScript versions of methods in [lesson11.ts](./structs_ts/src/lesson12.ts) and [stack.ts](./structs_ts/src/stack.ts).

0 commit comments

Comments
 (0)