precompute template result

Author: roguib

microservices/playground-ws/scripts/init.sql

@@ -2,10 +2,11 @@ CREATE TABLE templates (
     id VARCHAR(255) PRIMARY KEY,
     title VARCHAR(255),
     description TEXT,
-    program TEXT
+    program TEXT,
+    result VARCHAR(255)
 );
 
-INSERT INTO templates VALUES('variableBinding', 'Variable binding', 'How variable binding works in Monkey language', '');
+INSERT INTO templates VALUES('variableBinding', 'Variable binding', 'How variable binding works in Monkey language', '', '15');
 UPDATE templates
 SET program = (
     SELECT program
@@ -16,7 +17,7 @@ SET program = (
 )
 WHERE id = 'variableBinding';
 
-INSERT INTO templates VALUES('controlFlow', 'Control flow', 'Control the execution flow of a Monkey program', '');
+INSERT INTO templates VALUES('controlFlow', 'Control flow', 'Control the execution flow of a Monkey program', '', 'false');
 UPDATE templates
 SET program = (
     SELECT program
@@ -27,7 +28,7 @@ SET program = (
 )
 WHERE id = 'controlFlow';
 
-INSERT INTO templates VALUES('arrayBuiltinFn', 'Arrays and built in functions', 'Arrays data structure as well as built in functions to work with arrays', '');
+INSERT INTO templates VALUES('arrayBuiltinFn', 'Arrays and built in functions', 'Arrays data structure as well as built in functions to work with arrays', '', '[4, false, 1, 4, [99, 98, 97], 4, 25]');
 UPDATE templates
 SET program = (
     SELECT program
@@ -38,7 +39,7 @@ SET program = (
 )
 WHERE id = 'arrayBuiltinFn';
 
-INSERT INTO templates VALUES('dictionary', 'Dictionary data structure', 'Working with dictionaries', '');
+INSERT INTO templates VALUES('dictionary', 'Dictionary data structure', 'Working with dictionaries', '', '20');
 UPDATE templates
 SET program = (
     SELECT program
@@ -49,7 +50,7 @@ SET program = (
 )
 WHERE id = 'dictionary';
 
-INSERT INTO templates VALUES('closures', 'Closures', 'Closures in Monkey language', '');
+INSERT INTO templates VALUES('closures', 'Closures', 'Closures in Monkey language', '', '29');
 UPDATE templates
 SET program = (
     SELECT program

microservices/playground-ws/src/main/java/org/playground/ws/dao/TemplateDao.java

@@ -24,11 +24,15 @@ public class TemplateDao implements Serializable {
     @Column(name = "program")
     String program;
 
-    public static TemplateDao of(String title, String description, String program) {
+    @Column(name="result")
+    String result;
+
+    public static TemplateDao of(final String title, final String description, final String program, final String result) {
         TemplateDao template = new TemplateDao();
         template.setTitle(title);
         template.setDescription(description);
         template.setProgram(program);
+        template.setResult(result);
 
         return template;
     }
@@ -65,13 +69,11 @@ public void setProgram(String program) {
         this.program = program;
     }
 
-    @Override
-    public String toString() {
-        return "TemplateDao{" +
-                "id='" + id + '\'' +
-                ", title='" + title + '\'' +
-                ", description='" + description + '\'' +
-                ", program=" + program +
-                '}';
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
     }
 }

microservices/playground-ws/src/main/java/org/playground/ws/dto/PlaygroundDto.java

@@ -39,6 +39,10 @@ public ArrayList<PlaygroundHistoryDto> getHistory() {
         return history;
     }
 
+    public void setHistory(ArrayList<PlaygroundHistoryDto> history) {
+        this.history = history;
+    }
+
     public void addHistoryResult(final PlaygroundHistoryDto result) {
         this.history.add(result);
     }

microservices/playground-ws/src/main/java/org/playground/ws/factory/PlaygroundFactory.java

@@ -52,6 +52,9 @@ public PlaygroundDto getPlayground(final CreatePlaygroundDto createPlaygroundDto
         // if the user has selected a template, init the playground with the corresponding code
         if (templateDao.isPresent()) {
             playground.setProgram(templateDao.get().getProgram());
+            final ArrayList<PlaygroundHistoryDto> playgroundHistory = new ArrayList<>();
+            playgroundHistory.add(new PlaygroundHistoryDto(LocalDateTime.now(), templateDao.get().getResult()));
+            playground.setHistory(playgroundHistory);
         }
 
         // save the object in the cache, so we can start storing eval results

microservices/playground-ws/src/test/java/org/playground/ws/factory/PlaygroundFactoryTest.java

@@ -70,7 +70,7 @@ public void testNewPlaygroundFromTemplate() {
 
                 final String MOCKED_PROGRAM = "let a = 1; a;";
                 final Optional<TemplateDao> mockedFindByResponse = Optional.of(
-                        TemplateDao.of("Mocked title", "Mocked description", MOCKED_PROGRAM)
+                        TemplateDao.of("Mocked title", "Mocked description", MOCKED_PROGRAM, "1")
                 );
                 doReturn(mockedFindByResponse).when(this.templateRepository).findById(any());
                 final PlaygroundDto playground = this.playgroundFactory

web/playground/src/screens/playground/Playground.js

@@ -39,11 +39,6 @@ function Playground() {
         const { program = "", history = [] } = await getPlaygroundHistory(playgroundId);
         setProgram(program);
         setHistory(history);
-
-        if (program && !history.length) {
-          // TODO: This should already come in the history array. We shouldn't need an extra computation
-          handleEditorChanged(program);
-        }
       } catch (error) {
         setPlaygroundNotFound(true);
         return;